From 2d9c00cceca5e5465b04909362829e14f90c87b2 Mon Sep 17 00:00:00 2001 From: Eric Salo Date: Tue, 26 Mar 2024 08:19:20 -0700 Subject: [PATCH] upb: clean up open vs closed enums in the Dart gencode PiperOrigin-RevId: 619196103 --- upb/mini_descriptor/link.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/upb/mini_descriptor/link.c b/upb/mini_descriptor/link.c index 9f733f9939..bc5fa2f65b 100644 --- a/upb/mini_descriptor/link.c +++ b/upb/mini_descriptor/link.c @@ -114,9 +114,7 @@ bool upb_MiniTable_Link(upb_MiniTable* m, const upb_MiniTable** sub_tables, if (upb_MiniTableField_CType(f) == kUpb_CType_Message) { const upb_MiniTable* sub = sub_tables[msg_count++]; if (msg_count > sub_table_count) return false; - if (sub != NULL) { - if (!upb_MiniTable_SetSubMessage(m, f, sub)) return false; - } + if (sub && !upb_MiniTable_SetSubMessage(m, f, sub)) return false; } } @@ -126,11 +124,9 @@ bool upb_MiniTable_Link(upb_MiniTable* m, const upb_MiniTable** sub_tables, if (upb_MiniTableField_IsClosedEnum(f)) { const upb_MiniTableEnum* sub = sub_enums[enum_count++]; if (enum_count > sub_enum_count) return false; - if (sub != NULL) { - if (!upb_MiniTable_SetSubEnum(m, f, sub)) return false; - } + if (sub && !upb_MiniTable_SetSubEnum(m, f, sub)) return false; } } - return true; + return (msg_count == sub_table_count) && (enum_count == sub_enum_count); }