diff --git a/php/ext/google/protobuf/php-upb.c b/php/ext/google/protobuf/php-upb.c index bf43cd4b9f..1554c8f606 100644 --- a/php/ext/google/protobuf/php-upb.c +++ b/php/ext/google/protobuf/php-upb.c @@ -86,6 +86,12 @@ Error, UINTPTR_MAX is undefined #define UPB_API_INLINE UPB_INLINE #endif +#ifdef EXPORT_UPBC +#define UPBC_API UPB_EXPORT +#else +#define UPBC_API +#endif + #define UPB_MALLOC_ALIGN 8 #define UPB_ALIGN_UP(size, align) (((size) + (align) - 1) / (align) * (align)) #define UPB_ALIGN_DOWN(size, align) ((size) / (align) * (align)) @@ -8967,7 +8973,7 @@ const char* UPB_PRIVATE(_upb_WireReader_SkipGroup)( // Must be last. extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal google_protobuf_FileDescriptorSet_submsgs[1] = { +static const upb_MiniTableSubInternal google_protobuf_FileDescriptorSet__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FileDescriptorProto_msg_init_ptr}, }; @@ -8976,7 +8982,7 @@ static const upb_MiniTableField google_protobuf_FileDescriptorSet__fields[1] = { }; const upb_MiniTable google__protobuf__FileDescriptorSet_msg_init = { - &google_protobuf_FileDescriptorSet_submsgs[0], + &google_protobuf_FileDescriptorSet__submsgs[0], &google_protobuf_FileDescriptorSet__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, #ifdef UPB_TRACING_ENABLED @@ -8989,14 +8995,14 @@ const upb_MiniTable google__protobuf__FileDescriptorSet_msg_init = { }; const upb_MiniTable* google__protobuf__FileDescriptorSet_msg_init_ptr = &google__protobuf__FileDescriptorSet_msg_init; -static const upb_MiniTableSubInternal google_protobuf_FileDescriptorProto_submsgs[7] = { +static const upb_MiniTableSubInternal google_protobuf_FileDescriptorProto__submsgs[7] = { {.UPB_PRIVATE(submsg) = &google__protobuf__DescriptorProto_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__EnumDescriptorProto_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__ServiceDescriptorProto_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__FieldDescriptorProto_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__FileOptions_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__SourceCodeInfo_msg_init_ptr}, - {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init}, }; static const upb_MiniTableField google_protobuf_FileDescriptorProto__fields[13] = { @@ -9016,7 +9022,7 @@ static const upb_MiniTableField google_protobuf_FileDescriptorProto__fields[13] }; const upb_MiniTable google__protobuf__FileDescriptorProto_msg_init = { - &google_protobuf_FileDescriptorProto_submsgs[0], + &google_protobuf_FileDescriptorProto__submsgs[0], &google_protobuf_FileDescriptorProto__fields[0], UPB_SIZE(80, 136), 13, kUpb_ExtMode_NonExtendable, 12, UPB_FASTTABLE_MASK(120), 0, #ifdef UPB_TRACING_ENABLED @@ -9043,7 +9049,7 @@ const upb_MiniTable google__protobuf__FileDescriptorProto_msg_init = { }; const upb_MiniTable* google__protobuf__FileDescriptorProto_msg_init_ptr = &google__protobuf__FileDescriptorProto_msg_init; -static const upb_MiniTableSubInternal google_protobuf_DescriptorProto_submsgs[8] = { +static const upb_MiniTableSubInternal google_protobuf_DescriptorProto__submsgs[8] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FieldDescriptorProto_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__DescriptorProto_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__EnumDescriptorProto_msg_init_ptr}, @@ -9068,7 +9074,7 @@ static const upb_MiniTableField google_protobuf_DescriptorProto__fields[10] = { }; const upb_MiniTable google__protobuf__DescriptorProto_msg_init = { - &google_protobuf_DescriptorProto_submsgs[0], + &google_protobuf_DescriptorProto__submsgs[0], &google_protobuf_DescriptorProto__fields[0], UPB_SIZE(56, 104), 10, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(120), 0, #ifdef UPB_TRACING_ENABLED @@ -9095,7 +9101,7 @@ const upb_MiniTable google__protobuf__DescriptorProto_msg_init = { }; const upb_MiniTable* google__protobuf__DescriptorProto_msg_init_ptr = &google__protobuf__DescriptorProto_msg_init; -static const upb_MiniTableSubInternal google_protobuf_DescriptorProto_ExtensionRange_submsgs[1] = { +static const upb_MiniTableSubInternal google_protobuf_DescriptorProto_ExtensionRange__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__ExtensionRangeOptions_msg_init_ptr}, }; @@ -9106,7 +9112,7 @@ static const upb_MiniTableField google_protobuf_DescriptorProto_ExtensionRange__ }; const upb_MiniTable google__protobuf__DescriptorProto__ExtensionRange_msg_init = { - &google_protobuf_DescriptorProto_ExtensionRange_submsgs[0], + &google_protobuf_DescriptorProto_ExtensionRange__submsgs[0], &google_protobuf_DescriptorProto_ExtensionRange__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(255), 0, #ifdef UPB_TRACING_ENABLED @@ -9130,11 +9136,11 @@ const upb_MiniTable google__protobuf__DescriptorProto__ReservedRange_msg_init = }; const upb_MiniTable* google__protobuf__DescriptorProto__ReservedRange_msg_init_ptr = &google__protobuf__DescriptorProto__ReservedRange_msg_init; -static const upb_MiniTableSubInternal google_protobuf_ExtensionRangeOptions_submsgs[4] = { +static const upb_MiniTableSubInternal google_protobuf_ExtensionRangeOptions__submsgs[4] = { {.UPB_PRIVATE(submsg) = &google__protobuf__ExtensionRangeOptions__Declaration_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, - {.UPB_PRIVATE(subenum) = &google_protobuf_ExtensionRangeOptions_VerificationState_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__ExtensionRangeOptions__VerificationState_enum_init}, }; static const upb_MiniTableField google_protobuf_ExtensionRangeOptions__fields[4] = { @@ -9145,7 +9151,7 @@ static const upb_MiniTableField google_protobuf_ExtensionRangeOptions__fields[4] }; const upb_MiniTable google__protobuf__ExtensionRangeOptions_msg_init = { - &google_protobuf_ExtensionRangeOptions_submsgs[0], + &google_protobuf_ExtensionRangeOptions__submsgs[0], &google_protobuf_ExtensionRangeOptions__fields[0], UPB_SIZE(32, 40), 4, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0, #ifdef UPB_TRACING_ENABLED @@ -9206,10 +9212,10 @@ const upb_MiniTable google__protobuf__ExtensionRangeOptions__Declaration_msg_ini }; const upb_MiniTable* google__protobuf__ExtensionRangeOptions__Declaration_msg_init_ptr = &google__protobuf__ExtensionRangeOptions__Declaration_msg_init; -static const upb_MiniTableSubInternal google_protobuf_FieldDescriptorProto_submsgs[3] = { +static const upb_MiniTableSubInternal google_protobuf_FieldDescriptorProto__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions_msg_init_ptr}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FieldDescriptorProto_Label_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FieldDescriptorProto_Type_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FieldDescriptorProto__Label_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FieldDescriptorProto__Type_enum_init}, }; static const upb_MiniTableField google_protobuf_FieldDescriptorProto__fields[11] = { @@ -9227,7 +9233,7 @@ static const upb_MiniTableField google_protobuf_FieldDescriptorProto__fields[11] }; const upb_MiniTable google__protobuf__FieldDescriptorProto_msg_init = { - &google_protobuf_FieldDescriptorProto_submsgs[0], + &google_protobuf_FieldDescriptorProto__submsgs[0], &google_protobuf_FieldDescriptorProto__fields[0], UPB_SIZE(80, 120), 11, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(255), 0, #ifdef UPB_TRACING_ENABLED @@ -9236,7 +9242,7 @@ const upb_MiniTable google__protobuf__FieldDescriptorProto_msg_init = { }; const upb_MiniTable* google__protobuf__FieldDescriptorProto_msg_init_ptr = &google__protobuf__FieldDescriptorProto_msg_init; -static const upb_MiniTableSubInternal google_protobuf_OneofDescriptorProto_submsgs[1] = { +static const upb_MiniTableSubInternal google_protobuf_OneofDescriptorProto__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__OneofOptions_msg_init_ptr}, }; @@ -9246,7 +9252,7 @@ static const upb_MiniTableField google_protobuf_OneofDescriptorProto__fields[2] }; const upb_MiniTable google__protobuf__OneofDescriptorProto_msg_init = { - &google_protobuf_OneofDescriptorProto_submsgs[0], + &google_protobuf_OneofDescriptorProto__submsgs[0], &google_protobuf_OneofDescriptorProto__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, #ifdef UPB_TRACING_ENABLED @@ -9255,7 +9261,7 @@ const upb_MiniTable google__protobuf__OneofDescriptorProto_msg_init = { }; const upb_MiniTable* google__protobuf__OneofDescriptorProto_msg_init_ptr = &google__protobuf__OneofDescriptorProto_msg_init; -static const upb_MiniTableSubInternal google_protobuf_EnumDescriptorProto_submsgs[3] = { +static const upb_MiniTableSubInternal google_protobuf_EnumDescriptorProto__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__EnumValueDescriptorProto_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__EnumOptions_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init_ptr}, @@ -9270,7 +9276,7 @@ static const upb_MiniTableField google_protobuf_EnumDescriptorProto__fields[5] = }; const upb_MiniTable google__protobuf__EnumDescriptorProto_msg_init = { - &google_protobuf_EnumDescriptorProto_submsgs[0], + &google_protobuf_EnumDescriptorProto__submsgs[0], &google_protobuf_EnumDescriptorProto__fields[0], UPB_SIZE(40, 64), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, #ifdef UPB_TRACING_ENABLED @@ -9304,7 +9310,7 @@ const upb_MiniTable google__protobuf__EnumDescriptorProto__EnumReservedRange_msg }; const upb_MiniTable* google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init_ptr = &google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init; -static const upb_MiniTableSubInternal google_protobuf_EnumValueDescriptorProto_submsgs[1] = { +static const upb_MiniTableSubInternal google_protobuf_EnumValueDescriptorProto__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__EnumValueOptions_msg_init_ptr}, }; @@ -9315,7 +9321,7 @@ static const upb_MiniTableField google_protobuf_EnumValueDescriptorProto__fields }; const upb_MiniTable google__protobuf__EnumValueDescriptorProto_msg_init = { - &google_protobuf_EnumValueDescriptorProto_submsgs[0], + &google_protobuf_EnumValueDescriptorProto__submsgs[0], &google_protobuf_EnumValueDescriptorProto__fields[0], UPB_SIZE(32, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(255), 0, #ifdef UPB_TRACING_ENABLED @@ -9324,7 +9330,7 @@ const upb_MiniTable google__protobuf__EnumValueDescriptorProto_msg_init = { }; const upb_MiniTable* google__protobuf__EnumValueDescriptorProto_msg_init_ptr = &google__protobuf__EnumValueDescriptorProto_msg_init; -static const upb_MiniTableSubInternal google_protobuf_ServiceDescriptorProto_submsgs[2] = { +static const upb_MiniTableSubInternal google_protobuf_ServiceDescriptorProto__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__MethodDescriptorProto_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__ServiceOptions_msg_init_ptr}, }; @@ -9336,7 +9342,7 @@ static const upb_MiniTableField google_protobuf_ServiceDescriptorProto__fields[3 }; const upb_MiniTable google__protobuf__ServiceDescriptorProto_msg_init = { - &google_protobuf_ServiceDescriptorProto_submsgs[0], + &google_protobuf_ServiceDescriptorProto__submsgs[0], &google_protobuf_ServiceDescriptorProto__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, #ifdef UPB_TRACING_ENABLED @@ -9351,7 +9357,7 @@ const upb_MiniTable google__protobuf__ServiceDescriptorProto_msg_init = { }; const upb_MiniTable* google__protobuf__ServiceDescriptorProto_msg_init_ptr = &google__protobuf__ServiceDescriptorProto_msg_init; -static const upb_MiniTableSubInternal google_protobuf_MethodDescriptorProto_submsgs[1] = { +static const upb_MiniTableSubInternal google_protobuf_MethodDescriptorProto__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__MethodOptions_msg_init_ptr}, }; @@ -9365,7 +9371,7 @@ static const upb_MiniTableField google_protobuf_MethodDescriptorProto__fields[6] }; const upb_MiniTable google__protobuf__MethodDescriptorProto_msg_init = { - &google_protobuf_MethodDescriptorProto_submsgs[0], + &google_protobuf_MethodDescriptorProto__submsgs[0], &google_protobuf_MethodDescriptorProto__fields[0], UPB_SIZE(48, 72), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(255), 0, #ifdef UPB_TRACING_ENABLED @@ -9374,10 +9380,10 @@ const upb_MiniTable google__protobuf__MethodDescriptorProto_msg_init = { }; const upb_MiniTable* google__protobuf__MethodDescriptorProto_msg_init_ptr = &google__protobuf__MethodDescriptorProto_msg_init; -static const upb_MiniTableSubInternal google_protobuf_FileOptions_submsgs[3] = { +static const upb_MiniTableSubInternal google_protobuf_FileOptions__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FileOptions_OptimizeMode_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FileOptions__OptimizeMode_enum_init}, }; static const upb_MiniTableField google_protobuf_FileOptions__fields[21] = { @@ -9405,7 +9411,7 @@ static const upb_MiniTableField google_protobuf_FileOptions__fields[21] = { }; const upb_MiniTable google__protobuf__FileOptions_msg_init = { - &google_protobuf_FileOptions_submsgs[0], + &google_protobuf_FileOptions__submsgs[0], &google_protobuf_FileOptions__fields[0], UPB_SIZE(112, 200), 21, kUpb_ExtMode_Extendable, 1, UPB_FASTTABLE_MASK(248), 0, #ifdef UPB_TRACING_ENABLED @@ -9448,7 +9454,7 @@ const upb_MiniTable google__protobuf__FileOptions_msg_init = { }; const upb_MiniTable* google__protobuf__FileOptions_msg_init_ptr = &google__protobuf__FileOptions_msg_init; -static const upb_MiniTableSubInternal google_protobuf_MessageOptions_submsgs[2] = { +static const upb_MiniTableSubInternal google_protobuf_MessageOptions__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, }; @@ -9464,7 +9470,7 @@ static const upb_MiniTableField google_protobuf_MessageOptions__fields[7] = { }; const upb_MiniTable google__protobuf__MessageOptions_msg_init = { - &google_protobuf_MessageOptions_submsgs[0], + &google_protobuf_MessageOptions__submsgs[0], &google_protobuf_MessageOptions__fields[0], UPB_SIZE(24, 32), 7, kUpb_ExtMode_Extendable, 3, UPB_FASTTABLE_MASK(248), 0, #ifdef UPB_TRACING_ENABLED @@ -9507,15 +9513,15 @@ const upb_MiniTable google__protobuf__MessageOptions_msg_init = { }; const upb_MiniTable* google__protobuf__MessageOptions_msg_init_ptr = &google__protobuf__MessageOptions_msg_init; -static const upb_MiniTableSubInternal google_protobuf_FieldOptions_submsgs[8] = { +static const upb_MiniTableSubInternal google_protobuf_FieldOptions__submsgs[8] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions__EditionDefault_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions__FeatureSupport_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FieldOptions_CType_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FieldOptions_JSType_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FieldOptions_OptionRetention_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FieldOptions_OptionTargetType_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FieldOptions__CType_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FieldOptions__JSType_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FieldOptions__OptionRetention_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FieldOptions__OptionTargetType_enum_init}, }; static const upb_MiniTableField google_protobuf_FieldOptions__fields[14] = { @@ -9536,7 +9542,7 @@ static const upb_MiniTableField google_protobuf_FieldOptions__fields[14] = { }; const upb_MiniTable google__protobuf__FieldOptions_msg_init = { - &google_protobuf_FieldOptions_submsgs[0], + &google_protobuf_FieldOptions__submsgs[0], &google_protobuf_FieldOptions__fields[0], UPB_SIZE(56, 72), 14, kUpb_ExtMode_Extendable, 3, UPB_FASTTABLE_MASK(248), 0, #ifdef UPB_TRACING_ENABLED @@ -9579,8 +9585,8 @@ const upb_MiniTable google__protobuf__FieldOptions_msg_init = { }; const upb_MiniTable* google__protobuf__FieldOptions_msg_init_ptr = &google__protobuf__FieldOptions_msg_init; -static const upb_MiniTableSubInternal google_protobuf_FieldOptions_EditionDefault_submsgs[1] = { - {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, +static const upb_MiniTableSubInternal google_protobuf_FieldOptions_EditionDefault__submsgs[1] = { + {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init}, }; static const upb_MiniTableField google_protobuf_FieldOptions_EditionDefault__fields[2] = { @@ -9589,7 +9595,7 @@ static const upb_MiniTableField google_protobuf_FieldOptions_EditionDefault__fie }; const upb_MiniTable google__protobuf__FieldOptions__EditionDefault_msg_init = { - &google_protobuf_FieldOptions_EditionDefault_submsgs[0], + &google_protobuf_FieldOptions_EditionDefault__submsgs[0], &google_protobuf_FieldOptions_EditionDefault__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, #ifdef UPB_TRACING_ENABLED @@ -9598,10 +9604,10 @@ const upb_MiniTable google__protobuf__FieldOptions__EditionDefault_msg_init = { }; const upb_MiniTable* google__protobuf__FieldOptions__EditionDefault_msg_init_ptr = &google__protobuf__FieldOptions__EditionDefault_msg_init; -static const upb_MiniTableSubInternal google_protobuf_FieldOptions_FeatureSupport_submsgs[3] = { - {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, +static const upb_MiniTableSubInternal google_protobuf_FieldOptions_FeatureSupport__submsgs[3] = { + {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init}, }; static const upb_MiniTableField google_protobuf_FieldOptions_FeatureSupport__fields[4] = { @@ -9612,7 +9618,7 @@ static const upb_MiniTableField google_protobuf_FieldOptions_FeatureSupport__fie }; const upb_MiniTable google__protobuf__FieldOptions__FeatureSupport_msg_init = { - &google_protobuf_FieldOptions_FeatureSupport_submsgs[0], + &google_protobuf_FieldOptions_FeatureSupport__submsgs[0], &google_protobuf_FieldOptions_FeatureSupport__fields[0], UPB_SIZE(32, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(255), 0, #ifdef UPB_TRACING_ENABLED @@ -9621,7 +9627,7 @@ const upb_MiniTable google__protobuf__FieldOptions__FeatureSupport_msg_init = { }; const upb_MiniTable* google__protobuf__FieldOptions__FeatureSupport_msg_init_ptr = &google__protobuf__FieldOptions__FeatureSupport_msg_init; -static const upb_MiniTableSubInternal google_protobuf_OneofOptions_submsgs[2] = { +static const upb_MiniTableSubInternal google_protobuf_OneofOptions__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, }; @@ -9632,7 +9638,7 @@ static const upb_MiniTableField google_protobuf_OneofOptions__fields[2] = { }; const upb_MiniTable google__protobuf__OneofOptions_msg_init = { - &google_protobuf_OneofOptions_submsgs[0], + &google_protobuf_OneofOptions__submsgs[0], &google_protobuf_OneofOptions__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_Extendable, 1, UPB_FASTTABLE_MASK(248), 0, #ifdef UPB_TRACING_ENABLED @@ -9675,7 +9681,7 @@ const upb_MiniTable google__protobuf__OneofOptions_msg_init = { }; const upb_MiniTable* google__protobuf__OneofOptions_msg_init_ptr = &google__protobuf__OneofOptions_msg_init; -static const upb_MiniTableSubInternal google_protobuf_EnumOptions_submsgs[2] = { +static const upb_MiniTableSubInternal google_protobuf_EnumOptions__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, }; @@ -9689,7 +9695,7 @@ static const upb_MiniTableField google_protobuf_EnumOptions__fields[5] = { }; const upb_MiniTable google__protobuf__EnumOptions_msg_init = { - &google_protobuf_EnumOptions_submsgs[0], + &google_protobuf_EnumOptions__submsgs[0], &google_protobuf_EnumOptions__fields[0], UPB_SIZE(24, 32), 5, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0, #ifdef UPB_TRACING_ENABLED @@ -9732,7 +9738,7 @@ const upb_MiniTable google__protobuf__EnumOptions_msg_init = { }; const upb_MiniTable* google__protobuf__EnumOptions_msg_init_ptr = &google__protobuf__EnumOptions_msg_init; -static const upb_MiniTableSubInternal google_protobuf_EnumValueOptions_submsgs[3] = { +static const upb_MiniTableSubInternal google_protobuf_EnumValueOptions__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions__FeatureSupport_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, @@ -9747,7 +9753,7 @@ static const upb_MiniTableField google_protobuf_EnumValueOptions__fields[5] = { }; const upb_MiniTable google__protobuf__EnumValueOptions_msg_init = { - &google_protobuf_EnumValueOptions_submsgs[0], + &google_protobuf_EnumValueOptions__submsgs[0], &google_protobuf_EnumValueOptions__fields[0], UPB_SIZE(32, 40), 5, kUpb_ExtMode_Extendable, 4, UPB_FASTTABLE_MASK(248), 0, #ifdef UPB_TRACING_ENABLED @@ -9790,7 +9796,7 @@ const upb_MiniTable google__protobuf__EnumValueOptions_msg_init = { }; const upb_MiniTable* google__protobuf__EnumValueOptions_msg_init_ptr = &google__protobuf__EnumValueOptions_msg_init; -static const upb_MiniTableSubInternal google_protobuf_ServiceOptions_submsgs[2] = { +static const upb_MiniTableSubInternal google_protobuf_ServiceOptions__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, }; @@ -9802,7 +9808,7 @@ static const upb_MiniTableField google_protobuf_ServiceOptions__fields[3] = { }; const upb_MiniTable google__protobuf__ServiceOptions_msg_init = { - &google_protobuf_ServiceOptions_submsgs[0], + &google_protobuf_ServiceOptions__submsgs[0], &google_protobuf_ServiceOptions__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0, #ifdef UPB_TRACING_ENABLED @@ -9845,10 +9851,10 @@ const upb_MiniTable google__protobuf__ServiceOptions_msg_init = { }; const upb_MiniTable* google__protobuf__ServiceOptions_msg_init_ptr = &google__protobuf__ServiceOptions_msg_init; -static const upb_MiniTableSubInternal google_protobuf_MethodOptions_submsgs[3] = { +static const upb_MiniTableSubInternal google_protobuf_MethodOptions__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, - {.UPB_PRIVATE(subenum) = &google_protobuf_MethodOptions_IdempotencyLevel_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__MethodOptions__IdempotencyLevel_enum_init}, }; static const upb_MiniTableField google_protobuf_MethodOptions__fields[4] = { @@ -9859,7 +9865,7 @@ static const upb_MiniTableField google_protobuf_MethodOptions__fields[4] = { }; const upb_MiniTable google__protobuf__MethodOptions_msg_init = { - &google_protobuf_MethodOptions_submsgs[0], + &google_protobuf_MethodOptions__submsgs[0], &google_protobuf_MethodOptions__fields[0], UPB_SIZE(24, 32), 4, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0, #ifdef UPB_TRACING_ENABLED @@ -9902,7 +9908,7 @@ const upb_MiniTable google__protobuf__MethodOptions_msg_init = { }; const upb_MiniTable* google__protobuf__MethodOptions_msg_init_ptr = &google__protobuf__MethodOptions_msg_init; -static const upb_MiniTableSubInternal google_protobuf_UninterpretedOption_submsgs[1] = { +static const upb_MiniTableSubInternal google_protobuf_UninterpretedOption__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption__NamePart_msg_init_ptr}, }; @@ -9917,7 +9923,7 @@ static const upb_MiniTableField google_protobuf_UninterpretedOption__fields[7] = }; const upb_MiniTable google__protobuf__UninterpretedOption_msg_init = { - &google_protobuf_UninterpretedOption_submsgs[0], + &google_protobuf_UninterpretedOption__submsgs[0], &google_protobuf_UninterpretedOption__fields[0], UPB_SIZE(64, 96), 7, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0, #ifdef UPB_TRACING_ENABLED @@ -9947,13 +9953,13 @@ const upb_MiniTable google__protobuf__UninterpretedOption__NamePart_msg_init = { }; const upb_MiniTable* google__protobuf__UninterpretedOption__NamePart_msg_init_ptr = &google__protobuf__UninterpretedOption__NamePart_msg_init; -static const upb_MiniTableSubInternal google_protobuf_FeatureSet_submsgs[6] = { - {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_FieldPresence_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_EnumType_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_Utf8Validation_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_MessageEncoding_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_JsonFormat_enum_init}, +static const upb_MiniTableSubInternal google_protobuf_FeatureSet__submsgs[6] = { + {.UPB_PRIVATE(subenum) = &google__protobuf__FeatureSet__FieldPresence_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FeatureSet__EnumType_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FeatureSet__RepeatedFieldEncoding_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FeatureSet__Utf8Validation_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FeatureSet__MessageEncoding_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FeatureSet__JsonFormat_enum_init}, }; static const upb_MiniTableField google_protobuf_FeatureSet__fields[6] = { @@ -9966,7 +9972,7 @@ static const upb_MiniTableField google_protobuf_FeatureSet__fields[6] = { }; const upb_MiniTable google__protobuf__FeatureSet_msg_init = { - &google_protobuf_FeatureSet_submsgs[0], + &google_protobuf_FeatureSet__submsgs[0], &google_protobuf_FeatureSet__fields[0], 40, 6, kUpb_ExtMode_Extendable, 6, UPB_FASTTABLE_MASK(255), 0, #ifdef UPB_TRACING_ENABLED @@ -9975,10 +9981,10 @@ const upb_MiniTable google__protobuf__FeatureSet_msg_init = { }; const upb_MiniTable* google__protobuf__FeatureSet_msg_init_ptr = &google__protobuf__FeatureSet_msg_init; -static const upb_MiniTableSubInternal google_protobuf_FeatureSetDefaults_submsgs[3] = { +static const upb_MiniTableSubInternal google_protobuf_FeatureSetDefaults__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init_ptr}, - {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init}, }; static const upb_MiniTableField google_protobuf_FeatureSetDefaults__fields[3] = { @@ -9988,7 +9994,7 @@ static const upb_MiniTableField google_protobuf_FeatureSetDefaults__fields[3] = }; const upb_MiniTable google__protobuf__FeatureSetDefaults_msg_init = { - &google_protobuf_FeatureSetDefaults_submsgs[0], + &google_protobuf_FeatureSetDefaults__submsgs[0], &google_protobuf_FeatureSetDefaults__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, #ifdef UPB_TRACING_ENABLED @@ -10001,10 +10007,10 @@ const upb_MiniTable google__protobuf__FeatureSetDefaults_msg_init = { }; const upb_MiniTable* google__protobuf__FeatureSetDefaults_msg_init_ptr = &google__protobuf__FeatureSetDefaults_msg_init; -static const upb_MiniTableSubInternal google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_submsgs[3] = { +static const upb_MiniTableSubInternal google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, - {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init}, }; static const upb_MiniTableField google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault__fields[3] = { @@ -10014,7 +10020,7 @@ static const upb_MiniTableField google_protobuf_FeatureSetDefaults_FeatureSetEdi }; const upb_MiniTable google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init = { - &google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_submsgs[0], + &google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault__submsgs[0], &google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, #ifdef UPB_TRACING_ENABLED @@ -10023,7 +10029,7 @@ const upb_MiniTable google__protobuf__FeatureSetDefaults__FeatureSetEditionDefau }; const upb_MiniTable* google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init_ptr = &google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init; -static const upb_MiniTableSubInternal google_protobuf_SourceCodeInfo_submsgs[1] = { +static const upb_MiniTableSubInternal google_protobuf_SourceCodeInfo__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__SourceCodeInfo__Location_msg_init_ptr}, }; @@ -10032,7 +10038,7 @@ static const upb_MiniTableField google_protobuf_SourceCodeInfo__fields[1] = { }; const upb_MiniTable google__protobuf__SourceCodeInfo_msg_init = { - &google_protobuf_SourceCodeInfo_submsgs[0], + &google_protobuf_SourceCodeInfo__submsgs[0], &google_protobuf_SourceCodeInfo__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, #ifdef UPB_TRACING_ENABLED @@ -10073,7 +10079,7 @@ const upb_MiniTable google__protobuf__SourceCodeInfo__Location_msg_init = { }; const upb_MiniTable* google__protobuf__SourceCodeInfo__Location_msg_init_ptr = &google__protobuf__SourceCodeInfo__Location_msg_init; -static const upb_MiniTableSubInternal google_protobuf_GeneratedCodeInfo_submsgs[1] = { +static const upb_MiniTableSubInternal google_protobuf_GeneratedCodeInfo__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__GeneratedCodeInfo__Annotation_msg_init_ptr}, }; @@ -10082,7 +10088,7 @@ static const upb_MiniTableField google_protobuf_GeneratedCodeInfo__fields[1] = { }; const upb_MiniTable google__protobuf__GeneratedCodeInfo_msg_init = { - &google_protobuf_GeneratedCodeInfo_submsgs[0], + &google_protobuf_GeneratedCodeInfo__submsgs[0], &google_protobuf_GeneratedCodeInfo__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, #ifdef UPB_TRACING_ENABLED @@ -10095,8 +10101,8 @@ const upb_MiniTable google__protobuf__GeneratedCodeInfo_msg_init = { }; const upb_MiniTable* google__protobuf__GeneratedCodeInfo_msg_init_ptr = &google__protobuf__GeneratedCodeInfo_msg_init; -static const upb_MiniTableSubInternal google_protobuf_GeneratedCodeInfo_Annotation_submsgs[1] = { - {.UPB_PRIVATE(subenum) = &google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init}, +static const upb_MiniTableSubInternal google_protobuf_GeneratedCodeInfo_Annotation__submsgs[1] = { + {.UPB_PRIVATE(subenum) = &google__protobuf__GeneratedCodeInfo__Annotation__Semantic_enum_init}, }; static const upb_MiniTableField google_protobuf_GeneratedCodeInfo_Annotation__fields[5] = { @@ -10108,7 +10114,7 @@ static const upb_MiniTableField google_protobuf_GeneratedCodeInfo_Annotation__fi }; const upb_MiniTable google__protobuf__GeneratedCodeInfo__Annotation_msg_init = { - &google_protobuf_GeneratedCodeInfo_Annotation_submsgs[0], + &google_protobuf_GeneratedCodeInfo_Annotation__submsgs[0], &google_protobuf_GeneratedCodeInfo_Annotation__fields[0], UPB_SIZE(40, 48), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(8), 0, #ifdef UPB_TRACING_ENABLED @@ -10121,7 +10127,7 @@ const upb_MiniTable google__protobuf__GeneratedCodeInfo__Annotation_msg_init = { }; const upb_MiniTable* google__protobuf__GeneratedCodeInfo__Annotation_msg_init_ptr = &google__protobuf__GeneratedCodeInfo__Annotation_msg_init; -const upb_MiniTableEnum google_protobuf_Edition_enum_init = { +const upb_MiniTableEnum google__protobuf__Edition_enum_init = { 64, 9, { @@ -10139,7 +10145,7 @@ const upb_MiniTableEnum google_protobuf_Edition_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_ExtensionRangeOptions_VerificationState_enum_init = { +const upb_MiniTableEnum google__protobuf__ExtensionRangeOptions__VerificationState_enum_init = { 64, 0, { @@ -10148,7 +10154,7 @@ const upb_MiniTableEnum google_protobuf_ExtensionRangeOptions_VerificationState_ }, }; -const upb_MiniTableEnum google_protobuf_FeatureSet_EnumType_enum_init = { +const upb_MiniTableEnum google__protobuf__FeatureSet__EnumType_enum_init = { 64, 0, { @@ -10157,7 +10163,7 @@ const upb_MiniTableEnum google_protobuf_FeatureSet_EnumType_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_FeatureSet_FieldPresence_enum_init = { +const upb_MiniTableEnum google__protobuf__FeatureSet__FieldPresence_enum_init = { 64, 0, { @@ -10166,7 +10172,7 @@ const upb_MiniTableEnum google_protobuf_FeatureSet_FieldPresence_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_FeatureSet_JsonFormat_enum_init = { +const upb_MiniTableEnum google__protobuf__FeatureSet__JsonFormat_enum_init = { 64, 0, { @@ -10175,7 +10181,7 @@ const upb_MiniTableEnum google_protobuf_FeatureSet_JsonFormat_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_FeatureSet_MessageEncoding_enum_init = { +const upb_MiniTableEnum google__protobuf__FeatureSet__MessageEncoding_enum_init = { 64, 0, { @@ -10184,7 +10190,7 @@ const upb_MiniTableEnum google_protobuf_FeatureSet_MessageEncoding_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init = { +const upb_MiniTableEnum google__protobuf__FeatureSet__RepeatedFieldEncoding_enum_init = { 64, 0, { @@ -10193,7 +10199,7 @@ const upb_MiniTableEnum google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_in }, }; -const upb_MiniTableEnum google_protobuf_FeatureSet_Utf8Validation_enum_init = { +const upb_MiniTableEnum google__protobuf__FeatureSet__Utf8Validation_enum_init = { 64, 0, { @@ -10202,7 +10208,7 @@ const upb_MiniTableEnum google_protobuf_FeatureSet_Utf8Validation_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Label_enum_init = { +const upb_MiniTableEnum google__protobuf__FieldDescriptorProto__Label_enum_init = { 64, 0, { @@ -10211,7 +10217,7 @@ const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Label_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Type_enum_init = { +const upb_MiniTableEnum google__protobuf__FieldDescriptorProto__Type_enum_init = { 64, 0, { @@ -10220,7 +10226,7 @@ const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Type_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_FieldOptions_CType_enum_init = { +const upb_MiniTableEnum google__protobuf__FieldOptions__CType_enum_init = { 64, 0, { @@ -10229,7 +10235,7 @@ const upb_MiniTableEnum google_protobuf_FieldOptions_CType_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_FieldOptions_JSType_enum_init = { +const upb_MiniTableEnum google__protobuf__FieldOptions__JSType_enum_init = { 64, 0, { @@ -10238,7 +10244,7 @@ const upb_MiniTableEnum google_protobuf_FieldOptions_JSType_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_FieldOptions_OptionRetention_enum_init = { +const upb_MiniTableEnum google__protobuf__FieldOptions__OptionRetention_enum_init = { 64, 0, { @@ -10247,7 +10253,7 @@ const upb_MiniTableEnum google_protobuf_FieldOptions_OptionRetention_enum_init = }, }; -const upb_MiniTableEnum google_protobuf_FieldOptions_OptionTargetType_enum_init = { +const upb_MiniTableEnum google__protobuf__FieldOptions__OptionTargetType_enum_init = { 64, 0, { @@ -10256,7 +10262,7 @@ const upb_MiniTableEnum google_protobuf_FieldOptions_OptionTargetType_enum_init }, }; -const upb_MiniTableEnum google_protobuf_FileOptions_OptimizeMode_enum_init = { +const upb_MiniTableEnum google__protobuf__FileOptions__OptimizeMode_enum_init = { 64, 0, { @@ -10265,7 +10271,7 @@ const upb_MiniTableEnum google_protobuf_FileOptions_OptimizeMode_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init = { +const upb_MiniTableEnum google__protobuf__GeneratedCodeInfo__Annotation__Semantic_enum_init = { 64, 0, { @@ -10274,7 +10280,7 @@ const upb_MiniTableEnum google_protobuf_GeneratedCodeInfo_Annotation_Semantic_en }, }; -const upb_MiniTableEnum google_protobuf_MethodOptions_IdempotencyLevel_enum_init = { +const upb_MiniTableEnum google__protobuf__MethodOptions__IdempotencyLevel_enum_init = { 64, 0, { @@ -10320,23 +10326,23 @@ static const upb_MiniTable *messages_layout[33] = { }; static const upb_MiniTableEnum *enums_layout[17] = { - &google_protobuf_Edition_enum_init, - &google_protobuf_ExtensionRangeOptions_VerificationState_enum_init, - &google_protobuf_FeatureSet_EnumType_enum_init, - &google_protobuf_FeatureSet_FieldPresence_enum_init, - &google_protobuf_FeatureSet_JsonFormat_enum_init, - &google_protobuf_FeatureSet_MessageEncoding_enum_init, - &google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init, - &google_protobuf_FeatureSet_Utf8Validation_enum_init, - &google_protobuf_FieldDescriptorProto_Label_enum_init, - &google_protobuf_FieldDescriptorProto_Type_enum_init, - &google_protobuf_FieldOptions_CType_enum_init, - &google_protobuf_FieldOptions_JSType_enum_init, - &google_protobuf_FieldOptions_OptionRetention_enum_init, - &google_protobuf_FieldOptions_OptionTargetType_enum_init, - &google_protobuf_FileOptions_OptimizeMode_enum_init, - &google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init, - &google_protobuf_MethodOptions_IdempotencyLevel_enum_init, + &google__protobuf__Edition_enum_init, + &google__protobuf__ExtensionRangeOptions__VerificationState_enum_init, + &google__protobuf__FeatureSet__EnumType_enum_init, + &google__protobuf__FeatureSet__FieldPresence_enum_init, + &google__protobuf__FeatureSet__JsonFormat_enum_init, + &google__protobuf__FeatureSet__MessageEncoding_enum_init, + &google__protobuf__FeatureSet__RepeatedFieldEncoding_enum_init, + &google__protobuf__FeatureSet__Utf8Validation_enum_init, + &google__protobuf__FieldDescriptorProto__Label_enum_init, + &google__protobuf__FieldDescriptorProto__Type_enum_init, + &google__protobuf__FieldOptions__CType_enum_init, + &google__protobuf__FieldOptions__JSType_enum_init, + &google__protobuf__FieldOptions__OptionRetention_enum_init, + &google__protobuf__FieldOptions__OptionTargetType_enum_init, + &google__protobuf__FileOptions__OptimizeMode_enum_init, + &google__protobuf__GeneratedCodeInfo__Annotation__Semantic_enum_init, + &google__protobuf__MethodOptions__IdempotencyLevel_enum_init, }; const upb_MiniTableFile google_protobuf_descriptor_proto_upb_file_layout = { @@ -17079,6 +17085,7 @@ upb_ServiceDef* _upb_ServiceDefs_New(upb_DefBuilder* ctx, int n, #undef UPB_EXPORT #undef UPB_INLINE #undef UPB_API +#undef UPBC_API #undef UPB_API_INLINE #undef UPB_ALIGN_UP #undef UPB_ALIGN_DOWN diff --git a/php/ext/google/protobuf/php-upb.h b/php/ext/google/protobuf/php-upb.h index 18d5730a34..e707d97392 100644 --- a/php/ext/google/protobuf/php-upb.h +++ b/php/ext/google/protobuf/php-upb.h @@ -85,6 +85,12 @@ Error, UINTPTR_MAX is undefined #define UPB_API_INLINE UPB_INLINE #endif +#ifdef EXPORT_UPBC +#define UPBC_API UPB_EXPORT +#else +#define UPBC_API +#endif + #define UPB_MALLOC_ALIGN 8 #define UPB_ALIGN_UP(size, align) (((size) + (align) - 1) / (align) * (align)) #define UPB_ALIGN_DOWN(size, align) ((size) / (align) * (align)) @@ -1203,8 +1209,8 @@ UPB_INLINE bool upb_StringView_IsEqual(upb_StringView a, upb_StringView b) { * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_ -#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_ +#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_H_ +#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_H_ #ifndef UPB_GENERATED_CODE_SUPPORT_H_ @@ -5330,8 +5336,8 @@ TAGBYTES(r) * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_MINITABLE_H_ -#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_MINITABLE_H_ +#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_MINITABLE_H_ +#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_MINITABLE_H_ // Must be last. @@ -5407,23 +5413,23 @@ extern const upb_MiniTable* google__protobuf__GeneratedCodeInfo_msg_init_ptr; extern const upb_MiniTable google__protobuf__GeneratedCodeInfo__Annotation_msg_init; extern const upb_MiniTable* google__protobuf__GeneratedCodeInfo__Annotation_msg_init_ptr; -extern const upb_MiniTableEnum google_protobuf_Edition_enum_init; -extern const upb_MiniTableEnum google_protobuf_ExtensionRangeOptions_VerificationState_enum_init; -extern const upb_MiniTableEnum google_protobuf_FeatureSet_EnumType_enum_init; -extern const upb_MiniTableEnum google_protobuf_FeatureSet_FieldPresence_enum_init; -extern const upb_MiniTableEnum google_protobuf_FeatureSet_JsonFormat_enum_init; -extern const upb_MiniTableEnum google_protobuf_FeatureSet_MessageEncoding_enum_init; -extern const upb_MiniTableEnum google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init; -extern const upb_MiniTableEnum google_protobuf_FeatureSet_Utf8Validation_enum_init; -extern const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Label_enum_init; -extern const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Type_enum_init; -extern const upb_MiniTableEnum google_protobuf_FieldOptions_CType_enum_init; -extern const upb_MiniTableEnum google_protobuf_FieldOptions_JSType_enum_init; -extern const upb_MiniTableEnum google_protobuf_FieldOptions_OptionRetention_enum_init; -extern const upb_MiniTableEnum google_protobuf_FieldOptions_OptionTargetType_enum_init; -extern const upb_MiniTableEnum google_protobuf_FileOptions_OptimizeMode_enum_init; -extern const upb_MiniTableEnum google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init; -extern const upb_MiniTableEnum google_protobuf_MethodOptions_IdempotencyLevel_enum_init; +extern const upb_MiniTableEnum google__protobuf__Edition_enum_init; +extern const upb_MiniTableEnum google__protobuf__ExtensionRangeOptions__VerificationState_enum_init; +extern const upb_MiniTableEnum google__protobuf__FeatureSet__EnumType_enum_init; +extern const upb_MiniTableEnum google__protobuf__FeatureSet__FieldPresence_enum_init; +extern const upb_MiniTableEnum google__protobuf__FeatureSet__JsonFormat_enum_init; +extern const upb_MiniTableEnum google__protobuf__FeatureSet__MessageEncoding_enum_init; +extern const upb_MiniTableEnum google__protobuf__FeatureSet__RepeatedFieldEncoding_enum_init; +extern const upb_MiniTableEnum google__protobuf__FeatureSet__Utf8Validation_enum_init; +extern const upb_MiniTableEnum google__protobuf__FieldDescriptorProto__Label_enum_init; +extern const upb_MiniTableEnum google__protobuf__FieldDescriptorProto__Type_enum_init; +extern const upb_MiniTableEnum google__protobuf__FieldOptions__CType_enum_init; +extern const upb_MiniTableEnum google__protobuf__FieldOptions__JSType_enum_init; +extern const upb_MiniTableEnum google__protobuf__FieldOptions__OptionRetention_enum_init; +extern const upb_MiniTableEnum google__protobuf__FieldOptions__OptionTargetType_enum_init; +extern const upb_MiniTableEnum google__protobuf__FileOptions__OptimizeMode_enum_init; +extern const upb_MiniTableEnum google__protobuf__GeneratedCodeInfo__Annotation__Semantic_enum_init; +extern const upb_MiniTableEnum google__protobuf__MethodOptions__IdempotencyLevel_enum_init; extern const upb_MiniTableFile google_protobuf_descriptor_proto_upb_file_layout; #ifdef __cplusplus @@ -5431,7 +5437,7 @@ extern const upb_MiniTableFile google_protobuf_descriptor_proto_upb_file_layout; #endif -#endif /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_MINITABLE_H_ */ +#endif /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_MINITABLE_H_ */ // Must be last. @@ -12312,7 +12318,7 @@ UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_semantic(google #endif -#endif /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_ */ +#endif /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_H_ */ #endif // IWYU pragma: end_exports @@ -14337,8 +14343,8 @@ UPB_INLINE const char* upb_WireReader_SkipValue( * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPBDEFS_H_ -#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPBDEFS_H_ +#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPBDEFS_H_ +#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPBDEFS_H_ #ifndef UPB_REFLECTION_DEF_POOL_INTERNAL_H_ @@ -14564,7 +14570,7 @@ UPB_INLINE const upb_MessageDef *google_protobuf_GeneratedCodeInfo_Annotation_ge #endif -#endif /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPBDEFS_H_ */ +#endif /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPBDEFS_H_ */ #ifndef UPB_LEX_STRTOD_H_ #define UPB_LEX_STRTOD_H_ @@ -15268,6 +15274,7 @@ upb_MethodDef* _upb_MethodDefs_New(upb_DefBuilder* ctx, int n, #undef UPB_EXPORT #undef UPB_INLINE #undef UPB_API +#undef UPBC_API #undef UPB_API_INLINE #undef UPB_ALIGN_UP #undef UPB_ALIGN_DOWN diff --git a/ruby/ext/google/protobuf_c/ruby-upb.c b/ruby/ext/google/protobuf_c/ruby-upb.c index cebe248ba4..2b50635b53 100644 --- a/ruby/ext/google/protobuf_c/ruby-upb.c +++ b/ruby/ext/google/protobuf_c/ruby-upb.c @@ -86,6 +86,12 @@ Error, UINTPTR_MAX is undefined #define UPB_API_INLINE UPB_INLINE #endif +#ifdef EXPORT_UPBC +#define UPBC_API UPB_EXPORT +#else +#define UPBC_API +#endif + #define UPB_MALLOC_ALIGN 8 #define UPB_ALIGN_UP(size, align) (((size) + (align) - 1) / (align) * (align)) #define UPB_ALIGN_DOWN(size, align) ((size) / (align) * (align)) @@ -8967,7 +8973,7 @@ const char* UPB_PRIVATE(_upb_WireReader_SkipGroup)( // Must be last. extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal google_protobuf_FileDescriptorSet_submsgs[1] = { +static const upb_MiniTableSubInternal google_protobuf_FileDescriptorSet__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FileDescriptorProto_msg_init_ptr}, }; @@ -8976,7 +8982,7 @@ static const upb_MiniTableField google_protobuf_FileDescriptorSet__fields[1] = { }; const upb_MiniTable google__protobuf__FileDescriptorSet_msg_init = { - &google_protobuf_FileDescriptorSet_submsgs[0], + &google_protobuf_FileDescriptorSet__submsgs[0], &google_protobuf_FileDescriptorSet__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, #ifdef UPB_TRACING_ENABLED @@ -8989,14 +8995,14 @@ const upb_MiniTable google__protobuf__FileDescriptorSet_msg_init = { }; const upb_MiniTable* google__protobuf__FileDescriptorSet_msg_init_ptr = &google__protobuf__FileDescriptorSet_msg_init; -static const upb_MiniTableSubInternal google_protobuf_FileDescriptorProto_submsgs[7] = { +static const upb_MiniTableSubInternal google_protobuf_FileDescriptorProto__submsgs[7] = { {.UPB_PRIVATE(submsg) = &google__protobuf__DescriptorProto_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__EnumDescriptorProto_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__ServiceDescriptorProto_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__FieldDescriptorProto_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__FileOptions_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__SourceCodeInfo_msg_init_ptr}, - {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init}, }; static const upb_MiniTableField google_protobuf_FileDescriptorProto__fields[13] = { @@ -9016,7 +9022,7 @@ static const upb_MiniTableField google_protobuf_FileDescriptorProto__fields[13] }; const upb_MiniTable google__protobuf__FileDescriptorProto_msg_init = { - &google_protobuf_FileDescriptorProto_submsgs[0], + &google_protobuf_FileDescriptorProto__submsgs[0], &google_protobuf_FileDescriptorProto__fields[0], UPB_SIZE(80, 136), 13, kUpb_ExtMode_NonExtendable, 12, UPB_FASTTABLE_MASK(120), 0, #ifdef UPB_TRACING_ENABLED @@ -9043,7 +9049,7 @@ const upb_MiniTable google__protobuf__FileDescriptorProto_msg_init = { }; const upb_MiniTable* google__protobuf__FileDescriptorProto_msg_init_ptr = &google__protobuf__FileDescriptorProto_msg_init; -static const upb_MiniTableSubInternal google_protobuf_DescriptorProto_submsgs[8] = { +static const upb_MiniTableSubInternal google_protobuf_DescriptorProto__submsgs[8] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FieldDescriptorProto_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__DescriptorProto_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__EnumDescriptorProto_msg_init_ptr}, @@ -9068,7 +9074,7 @@ static const upb_MiniTableField google_protobuf_DescriptorProto__fields[10] = { }; const upb_MiniTable google__protobuf__DescriptorProto_msg_init = { - &google_protobuf_DescriptorProto_submsgs[0], + &google_protobuf_DescriptorProto__submsgs[0], &google_protobuf_DescriptorProto__fields[0], UPB_SIZE(56, 104), 10, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(120), 0, #ifdef UPB_TRACING_ENABLED @@ -9095,7 +9101,7 @@ const upb_MiniTable google__protobuf__DescriptorProto_msg_init = { }; const upb_MiniTable* google__protobuf__DescriptorProto_msg_init_ptr = &google__protobuf__DescriptorProto_msg_init; -static const upb_MiniTableSubInternal google_protobuf_DescriptorProto_ExtensionRange_submsgs[1] = { +static const upb_MiniTableSubInternal google_protobuf_DescriptorProto_ExtensionRange__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__ExtensionRangeOptions_msg_init_ptr}, }; @@ -9106,7 +9112,7 @@ static const upb_MiniTableField google_protobuf_DescriptorProto_ExtensionRange__ }; const upb_MiniTable google__protobuf__DescriptorProto__ExtensionRange_msg_init = { - &google_protobuf_DescriptorProto_ExtensionRange_submsgs[0], + &google_protobuf_DescriptorProto_ExtensionRange__submsgs[0], &google_protobuf_DescriptorProto_ExtensionRange__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(255), 0, #ifdef UPB_TRACING_ENABLED @@ -9130,11 +9136,11 @@ const upb_MiniTable google__protobuf__DescriptorProto__ReservedRange_msg_init = }; const upb_MiniTable* google__protobuf__DescriptorProto__ReservedRange_msg_init_ptr = &google__protobuf__DescriptorProto__ReservedRange_msg_init; -static const upb_MiniTableSubInternal google_protobuf_ExtensionRangeOptions_submsgs[4] = { +static const upb_MiniTableSubInternal google_protobuf_ExtensionRangeOptions__submsgs[4] = { {.UPB_PRIVATE(submsg) = &google__protobuf__ExtensionRangeOptions__Declaration_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, - {.UPB_PRIVATE(subenum) = &google_protobuf_ExtensionRangeOptions_VerificationState_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__ExtensionRangeOptions__VerificationState_enum_init}, }; static const upb_MiniTableField google_protobuf_ExtensionRangeOptions__fields[4] = { @@ -9145,7 +9151,7 @@ static const upb_MiniTableField google_protobuf_ExtensionRangeOptions__fields[4] }; const upb_MiniTable google__protobuf__ExtensionRangeOptions_msg_init = { - &google_protobuf_ExtensionRangeOptions_submsgs[0], + &google_protobuf_ExtensionRangeOptions__submsgs[0], &google_protobuf_ExtensionRangeOptions__fields[0], UPB_SIZE(32, 40), 4, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0, #ifdef UPB_TRACING_ENABLED @@ -9206,10 +9212,10 @@ const upb_MiniTable google__protobuf__ExtensionRangeOptions__Declaration_msg_ini }; const upb_MiniTable* google__protobuf__ExtensionRangeOptions__Declaration_msg_init_ptr = &google__protobuf__ExtensionRangeOptions__Declaration_msg_init; -static const upb_MiniTableSubInternal google_protobuf_FieldDescriptorProto_submsgs[3] = { +static const upb_MiniTableSubInternal google_protobuf_FieldDescriptorProto__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions_msg_init_ptr}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FieldDescriptorProto_Label_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FieldDescriptorProto_Type_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FieldDescriptorProto__Label_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FieldDescriptorProto__Type_enum_init}, }; static const upb_MiniTableField google_protobuf_FieldDescriptorProto__fields[11] = { @@ -9227,7 +9233,7 @@ static const upb_MiniTableField google_protobuf_FieldDescriptorProto__fields[11] }; const upb_MiniTable google__protobuf__FieldDescriptorProto_msg_init = { - &google_protobuf_FieldDescriptorProto_submsgs[0], + &google_protobuf_FieldDescriptorProto__submsgs[0], &google_protobuf_FieldDescriptorProto__fields[0], UPB_SIZE(80, 120), 11, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(255), 0, #ifdef UPB_TRACING_ENABLED @@ -9236,7 +9242,7 @@ const upb_MiniTable google__protobuf__FieldDescriptorProto_msg_init = { }; const upb_MiniTable* google__protobuf__FieldDescriptorProto_msg_init_ptr = &google__protobuf__FieldDescriptorProto_msg_init; -static const upb_MiniTableSubInternal google_protobuf_OneofDescriptorProto_submsgs[1] = { +static const upb_MiniTableSubInternal google_protobuf_OneofDescriptorProto__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__OneofOptions_msg_init_ptr}, }; @@ -9246,7 +9252,7 @@ static const upb_MiniTableField google_protobuf_OneofDescriptorProto__fields[2] }; const upb_MiniTable google__protobuf__OneofDescriptorProto_msg_init = { - &google_protobuf_OneofDescriptorProto_submsgs[0], + &google_protobuf_OneofDescriptorProto__submsgs[0], &google_protobuf_OneofDescriptorProto__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, #ifdef UPB_TRACING_ENABLED @@ -9255,7 +9261,7 @@ const upb_MiniTable google__protobuf__OneofDescriptorProto_msg_init = { }; const upb_MiniTable* google__protobuf__OneofDescriptorProto_msg_init_ptr = &google__protobuf__OneofDescriptorProto_msg_init; -static const upb_MiniTableSubInternal google_protobuf_EnumDescriptorProto_submsgs[3] = { +static const upb_MiniTableSubInternal google_protobuf_EnumDescriptorProto__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__EnumValueDescriptorProto_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__EnumOptions_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init_ptr}, @@ -9270,7 +9276,7 @@ static const upb_MiniTableField google_protobuf_EnumDescriptorProto__fields[5] = }; const upb_MiniTable google__protobuf__EnumDescriptorProto_msg_init = { - &google_protobuf_EnumDescriptorProto_submsgs[0], + &google_protobuf_EnumDescriptorProto__submsgs[0], &google_protobuf_EnumDescriptorProto__fields[0], UPB_SIZE(40, 64), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, #ifdef UPB_TRACING_ENABLED @@ -9304,7 +9310,7 @@ const upb_MiniTable google__protobuf__EnumDescriptorProto__EnumReservedRange_msg }; const upb_MiniTable* google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init_ptr = &google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init; -static const upb_MiniTableSubInternal google_protobuf_EnumValueDescriptorProto_submsgs[1] = { +static const upb_MiniTableSubInternal google_protobuf_EnumValueDescriptorProto__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__EnumValueOptions_msg_init_ptr}, }; @@ -9315,7 +9321,7 @@ static const upb_MiniTableField google_protobuf_EnumValueDescriptorProto__fields }; const upb_MiniTable google__protobuf__EnumValueDescriptorProto_msg_init = { - &google_protobuf_EnumValueDescriptorProto_submsgs[0], + &google_protobuf_EnumValueDescriptorProto__submsgs[0], &google_protobuf_EnumValueDescriptorProto__fields[0], UPB_SIZE(32, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(255), 0, #ifdef UPB_TRACING_ENABLED @@ -9324,7 +9330,7 @@ const upb_MiniTable google__protobuf__EnumValueDescriptorProto_msg_init = { }; const upb_MiniTable* google__protobuf__EnumValueDescriptorProto_msg_init_ptr = &google__protobuf__EnumValueDescriptorProto_msg_init; -static const upb_MiniTableSubInternal google_protobuf_ServiceDescriptorProto_submsgs[2] = { +static const upb_MiniTableSubInternal google_protobuf_ServiceDescriptorProto__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__MethodDescriptorProto_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__ServiceOptions_msg_init_ptr}, }; @@ -9336,7 +9342,7 @@ static const upb_MiniTableField google_protobuf_ServiceDescriptorProto__fields[3 }; const upb_MiniTable google__protobuf__ServiceDescriptorProto_msg_init = { - &google_protobuf_ServiceDescriptorProto_submsgs[0], + &google_protobuf_ServiceDescriptorProto__submsgs[0], &google_protobuf_ServiceDescriptorProto__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, #ifdef UPB_TRACING_ENABLED @@ -9351,7 +9357,7 @@ const upb_MiniTable google__protobuf__ServiceDescriptorProto_msg_init = { }; const upb_MiniTable* google__protobuf__ServiceDescriptorProto_msg_init_ptr = &google__protobuf__ServiceDescriptorProto_msg_init; -static const upb_MiniTableSubInternal google_protobuf_MethodDescriptorProto_submsgs[1] = { +static const upb_MiniTableSubInternal google_protobuf_MethodDescriptorProto__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__MethodOptions_msg_init_ptr}, }; @@ -9365,7 +9371,7 @@ static const upb_MiniTableField google_protobuf_MethodDescriptorProto__fields[6] }; const upb_MiniTable google__protobuf__MethodDescriptorProto_msg_init = { - &google_protobuf_MethodDescriptorProto_submsgs[0], + &google_protobuf_MethodDescriptorProto__submsgs[0], &google_protobuf_MethodDescriptorProto__fields[0], UPB_SIZE(48, 72), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(255), 0, #ifdef UPB_TRACING_ENABLED @@ -9374,10 +9380,10 @@ const upb_MiniTable google__protobuf__MethodDescriptorProto_msg_init = { }; const upb_MiniTable* google__protobuf__MethodDescriptorProto_msg_init_ptr = &google__protobuf__MethodDescriptorProto_msg_init; -static const upb_MiniTableSubInternal google_protobuf_FileOptions_submsgs[3] = { +static const upb_MiniTableSubInternal google_protobuf_FileOptions__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FileOptions_OptimizeMode_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FileOptions__OptimizeMode_enum_init}, }; static const upb_MiniTableField google_protobuf_FileOptions__fields[21] = { @@ -9405,7 +9411,7 @@ static const upb_MiniTableField google_protobuf_FileOptions__fields[21] = { }; const upb_MiniTable google__protobuf__FileOptions_msg_init = { - &google_protobuf_FileOptions_submsgs[0], + &google_protobuf_FileOptions__submsgs[0], &google_protobuf_FileOptions__fields[0], UPB_SIZE(112, 200), 21, kUpb_ExtMode_Extendable, 1, UPB_FASTTABLE_MASK(248), 0, #ifdef UPB_TRACING_ENABLED @@ -9448,7 +9454,7 @@ const upb_MiniTable google__protobuf__FileOptions_msg_init = { }; const upb_MiniTable* google__protobuf__FileOptions_msg_init_ptr = &google__protobuf__FileOptions_msg_init; -static const upb_MiniTableSubInternal google_protobuf_MessageOptions_submsgs[2] = { +static const upb_MiniTableSubInternal google_protobuf_MessageOptions__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, }; @@ -9464,7 +9470,7 @@ static const upb_MiniTableField google_protobuf_MessageOptions__fields[7] = { }; const upb_MiniTable google__protobuf__MessageOptions_msg_init = { - &google_protobuf_MessageOptions_submsgs[0], + &google_protobuf_MessageOptions__submsgs[0], &google_protobuf_MessageOptions__fields[0], UPB_SIZE(24, 32), 7, kUpb_ExtMode_Extendable, 3, UPB_FASTTABLE_MASK(248), 0, #ifdef UPB_TRACING_ENABLED @@ -9507,15 +9513,15 @@ const upb_MiniTable google__protobuf__MessageOptions_msg_init = { }; const upb_MiniTable* google__protobuf__MessageOptions_msg_init_ptr = &google__protobuf__MessageOptions_msg_init; -static const upb_MiniTableSubInternal google_protobuf_FieldOptions_submsgs[8] = { +static const upb_MiniTableSubInternal google_protobuf_FieldOptions__submsgs[8] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions__EditionDefault_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions__FeatureSupport_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FieldOptions_CType_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FieldOptions_JSType_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FieldOptions_OptionRetention_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FieldOptions_OptionTargetType_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FieldOptions__CType_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FieldOptions__JSType_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FieldOptions__OptionRetention_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FieldOptions__OptionTargetType_enum_init}, }; static const upb_MiniTableField google_protobuf_FieldOptions__fields[14] = { @@ -9536,7 +9542,7 @@ static const upb_MiniTableField google_protobuf_FieldOptions__fields[14] = { }; const upb_MiniTable google__protobuf__FieldOptions_msg_init = { - &google_protobuf_FieldOptions_submsgs[0], + &google_protobuf_FieldOptions__submsgs[0], &google_protobuf_FieldOptions__fields[0], UPB_SIZE(56, 72), 14, kUpb_ExtMode_Extendable, 3, UPB_FASTTABLE_MASK(248), 0, #ifdef UPB_TRACING_ENABLED @@ -9579,8 +9585,8 @@ const upb_MiniTable google__protobuf__FieldOptions_msg_init = { }; const upb_MiniTable* google__protobuf__FieldOptions_msg_init_ptr = &google__protobuf__FieldOptions_msg_init; -static const upb_MiniTableSubInternal google_protobuf_FieldOptions_EditionDefault_submsgs[1] = { - {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, +static const upb_MiniTableSubInternal google_protobuf_FieldOptions_EditionDefault__submsgs[1] = { + {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init}, }; static const upb_MiniTableField google_protobuf_FieldOptions_EditionDefault__fields[2] = { @@ -9589,7 +9595,7 @@ static const upb_MiniTableField google_protobuf_FieldOptions_EditionDefault__fie }; const upb_MiniTable google__protobuf__FieldOptions__EditionDefault_msg_init = { - &google_protobuf_FieldOptions_EditionDefault_submsgs[0], + &google_protobuf_FieldOptions_EditionDefault__submsgs[0], &google_protobuf_FieldOptions_EditionDefault__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, #ifdef UPB_TRACING_ENABLED @@ -9598,10 +9604,10 @@ const upb_MiniTable google__protobuf__FieldOptions__EditionDefault_msg_init = { }; const upb_MiniTable* google__protobuf__FieldOptions__EditionDefault_msg_init_ptr = &google__protobuf__FieldOptions__EditionDefault_msg_init; -static const upb_MiniTableSubInternal google_protobuf_FieldOptions_FeatureSupport_submsgs[3] = { - {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, +static const upb_MiniTableSubInternal google_protobuf_FieldOptions_FeatureSupport__submsgs[3] = { + {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init}, }; static const upb_MiniTableField google_protobuf_FieldOptions_FeatureSupport__fields[4] = { @@ -9612,7 +9618,7 @@ static const upb_MiniTableField google_protobuf_FieldOptions_FeatureSupport__fie }; const upb_MiniTable google__protobuf__FieldOptions__FeatureSupport_msg_init = { - &google_protobuf_FieldOptions_FeatureSupport_submsgs[0], + &google_protobuf_FieldOptions_FeatureSupport__submsgs[0], &google_protobuf_FieldOptions_FeatureSupport__fields[0], UPB_SIZE(32, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(255), 0, #ifdef UPB_TRACING_ENABLED @@ -9621,7 +9627,7 @@ const upb_MiniTable google__protobuf__FieldOptions__FeatureSupport_msg_init = { }; const upb_MiniTable* google__protobuf__FieldOptions__FeatureSupport_msg_init_ptr = &google__protobuf__FieldOptions__FeatureSupport_msg_init; -static const upb_MiniTableSubInternal google_protobuf_OneofOptions_submsgs[2] = { +static const upb_MiniTableSubInternal google_protobuf_OneofOptions__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, }; @@ -9632,7 +9638,7 @@ static const upb_MiniTableField google_protobuf_OneofOptions__fields[2] = { }; const upb_MiniTable google__protobuf__OneofOptions_msg_init = { - &google_protobuf_OneofOptions_submsgs[0], + &google_protobuf_OneofOptions__submsgs[0], &google_protobuf_OneofOptions__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_Extendable, 1, UPB_FASTTABLE_MASK(248), 0, #ifdef UPB_TRACING_ENABLED @@ -9675,7 +9681,7 @@ const upb_MiniTable google__protobuf__OneofOptions_msg_init = { }; const upb_MiniTable* google__protobuf__OneofOptions_msg_init_ptr = &google__protobuf__OneofOptions_msg_init; -static const upb_MiniTableSubInternal google_protobuf_EnumOptions_submsgs[2] = { +static const upb_MiniTableSubInternal google_protobuf_EnumOptions__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, }; @@ -9689,7 +9695,7 @@ static const upb_MiniTableField google_protobuf_EnumOptions__fields[5] = { }; const upb_MiniTable google__protobuf__EnumOptions_msg_init = { - &google_protobuf_EnumOptions_submsgs[0], + &google_protobuf_EnumOptions__submsgs[0], &google_protobuf_EnumOptions__fields[0], UPB_SIZE(24, 32), 5, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0, #ifdef UPB_TRACING_ENABLED @@ -9732,7 +9738,7 @@ const upb_MiniTable google__protobuf__EnumOptions_msg_init = { }; const upb_MiniTable* google__protobuf__EnumOptions_msg_init_ptr = &google__protobuf__EnumOptions_msg_init; -static const upb_MiniTableSubInternal google_protobuf_EnumValueOptions_submsgs[3] = { +static const upb_MiniTableSubInternal google_protobuf_EnumValueOptions__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions__FeatureSupport_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, @@ -9747,7 +9753,7 @@ static const upb_MiniTableField google_protobuf_EnumValueOptions__fields[5] = { }; const upb_MiniTable google__protobuf__EnumValueOptions_msg_init = { - &google_protobuf_EnumValueOptions_submsgs[0], + &google_protobuf_EnumValueOptions__submsgs[0], &google_protobuf_EnumValueOptions__fields[0], UPB_SIZE(32, 40), 5, kUpb_ExtMode_Extendable, 4, UPB_FASTTABLE_MASK(248), 0, #ifdef UPB_TRACING_ENABLED @@ -9790,7 +9796,7 @@ const upb_MiniTable google__protobuf__EnumValueOptions_msg_init = { }; const upb_MiniTable* google__protobuf__EnumValueOptions_msg_init_ptr = &google__protobuf__EnumValueOptions_msg_init; -static const upb_MiniTableSubInternal google_protobuf_ServiceOptions_submsgs[2] = { +static const upb_MiniTableSubInternal google_protobuf_ServiceOptions__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, }; @@ -9802,7 +9808,7 @@ static const upb_MiniTableField google_protobuf_ServiceOptions__fields[3] = { }; const upb_MiniTable google__protobuf__ServiceOptions_msg_init = { - &google_protobuf_ServiceOptions_submsgs[0], + &google_protobuf_ServiceOptions__submsgs[0], &google_protobuf_ServiceOptions__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0, #ifdef UPB_TRACING_ENABLED @@ -9845,10 +9851,10 @@ const upb_MiniTable google__protobuf__ServiceOptions_msg_init = { }; const upb_MiniTable* google__protobuf__ServiceOptions_msg_init_ptr = &google__protobuf__ServiceOptions_msg_init; -static const upb_MiniTableSubInternal google_protobuf_MethodOptions_submsgs[3] = { +static const upb_MiniTableSubInternal google_protobuf_MethodOptions__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, - {.UPB_PRIVATE(subenum) = &google_protobuf_MethodOptions_IdempotencyLevel_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__MethodOptions__IdempotencyLevel_enum_init}, }; static const upb_MiniTableField google_protobuf_MethodOptions__fields[4] = { @@ -9859,7 +9865,7 @@ static const upb_MiniTableField google_protobuf_MethodOptions__fields[4] = { }; const upb_MiniTable google__protobuf__MethodOptions_msg_init = { - &google_protobuf_MethodOptions_submsgs[0], + &google_protobuf_MethodOptions__submsgs[0], &google_protobuf_MethodOptions__fields[0], UPB_SIZE(24, 32), 4, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0, #ifdef UPB_TRACING_ENABLED @@ -9902,7 +9908,7 @@ const upb_MiniTable google__protobuf__MethodOptions_msg_init = { }; const upb_MiniTable* google__protobuf__MethodOptions_msg_init_ptr = &google__protobuf__MethodOptions_msg_init; -static const upb_MiniTableSubInternal google_protobuf_UninterpretedOption_submsgs[1] = { +static const upb_MiniTableSubInternal google_protobuf_UninterpretedOption__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption__NamePart_msg_init_ptr}, }; @@ -9917,7 +9923,7 @@ static const upb_MiniTableField google_protobuf_UninterpretedOption__fields[7] = }; const upb_MiniTable google__protobuf__UninterpretedOption_msg_init = { - &google_protobuf_UninterpretedOption_submsgs[0], + &google_protobuf_UninterpretedOption__submsgs[0], &google_protobuf_UninterpretedOption__fields[0], UPB_SIZE(64, 96), 7, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0, #ifdef UPB_TRACING_ENABLED @@ -9947,13 +9953,13 @@ const upb_MiniTable google__protobuf__UninterpretedOption__NamePart_msg_init = { }; const upb_MiniTable* google__protobuf__UninterpretedOption__NamePart_msg_init_ptr = &google__protobuf__UninterpretedOption__NamePart_msg_init; -static const upb_MiniTableSubInternal google_protobuf_FeatureSet_submsgs[6] = { - {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_FieldPresence_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_EnumType_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_Utf8Validation_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_MessageEncoding_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_JsonFormat_enum_init}, +static const upb_MiniTableSubInternal google_protobuf_FeatureSet__submsgs[6] = { + {.UPB_PRIVATE(subenum) = &google__protobuf__FeatureSet__FieldPresence_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FeatureSet__EnumType_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FeatureSet__RepeatedFieldEncoding_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FeatureSet__Utf8Validation_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FeatureSet__MessageEncoding_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FeatureSet__JsonFormat_enum_init}, }; static const upb_MiniTableField google_protobuf_FeatureSet__fields[6] = { @@ -9966,7 +9972,7 @@ static const upb_MiniTableField google_protobuf_FeatureSet__fields[6] = { }; const upb_MiniTable google__protobuf__FeatureSet_msg_init = { - &google_protobuf_FeatureSet_submsgs[0], + &google_protobuf_FeatureSet__submsgs[0], &google_protobuf_FeatureSet__fields[0], 40, 6, kUpb_ExtMode_Extendable, 6, UPB_FASTTABLE_MASK(255), 0, #ifdef UPB_TRACING_ENABLED @@ -9975,10 +9981,10 @@ const upb_MiniTable google__protobuf__FeatureSet_msg_init = { }; const upb_MiniTable* google__protobuf__FeatureSet_msg_init_ptr = &google__protobuf__FeatureSet_msg_init; -static const upb_MiniTableSubInternal google_protobuf_FeatureSetDefaults_submsgs[3] = { +static const upb_MiniTableSubInternal google_protobuf_FeatureSetDefaults__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init_ptr}, - {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init}, }; static const upb_MiniTableField google_protobuf_FeatureSetDefaults__fields[3] = { @@ -9988,7 +9994,7 @@ static const upb_MiniTableField google_protobuf_FeatureSetDefaults__fields[3] = }; const upb_MiniTable google__protobuf__FeatureSetDefaults_msg_init = { - &google_protobuf_FeatureSetDefaults_submsgs[0], + &google_protobuf_FeatureSetDefaults__submsgs[0], &google_protobuf_FeatureSetDefaults__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, #ifdef UPB_TRACING_ENABLED @@ -10001,10 +10007,10 @@ const upb_MiniTable google__protobuf__FeatureSetDefaults_msg_init = { }; const upb_MiniTable* google__protobuf__FeatureSetDefaults_msg_init_ptr = &google__protobuf__FeatureSetDefaults_msg_init; -static const upb_MiniTableSubInternal google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_submsgs[3] = { +static const upb_MiniTableSubInternal google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, - {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init}, }; static const upb_MiniTableField google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault__fields[3] = { @@ -10014,7 +10020,7 @@ static const upb_MiniTableField google_protobuf_FeatureSetDefaults_FeatureSetEdi }; const upb_MiniTable google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init = { - &google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_submsgs[0], + &google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault__submsgs[0], &google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, #ifdef UPB_TRACING_ENABLED @@ -10023,7 +10029,7 @@ const upb_MiniTable google__protobuf__FeatureSetDefaults__FeatureSetEditionDefau }; const upb_MiniTable* google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init_ptr = &google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init; -static const upb_MiniTableSubInternal google_protobuf_SourceCodeInfo_submsgs[1] = { +static const upb_MiniTableSubInternal google_protobuf_SourceCodeInfo__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__SourceCodeInfo__Location_msg_init_ptr}, }; @@ -10032,7 +10038,7 @@ static const upb_MiniTableField google_protobuf_SourceCodeInfo__fields[1] = { }; const upb_MiniTable google__protobuf__SourceCodeInfo_msg_init = { - &google_protobuf_SourceCodeInfo_submsgs[0], + &google_protobuf_SourceCodeInfo__submsgs[0], &google_protobuf_SourceCodeInfo__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, #ifdef UPB_TRACING_ENABLED @@ -10073,7 +10079,7 @@ const upb_MiniTable google__protobuf__SourceCodeInfo__Location_msg_init = { }; const upb_MiniTable* google__protobuf__SourceCodeInfo__Location_msg_init_ptr = &google__protobuf__SourceCodeInfo__Location_msg_init; -static const upb_MiniTableSubInternal google_protobuf_GeneratedCodeInfo_submsgs[1] = { +static const upb_MiniTableSubInternal google_protobuf_GeneratedCodeInfo__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__GeneratedCodeInfo__Annotation_msg_init_ptr}, }; @@ -10082,7 +10088,7 @@ static const upb_MiniTableField google_protobuf_GeneratedCodeInfo__fields[1] = { }; const upb_MiniTable google__protobuf__GeneratedCodeInfo_msg_init = { - &google_protobuf_GeneratedCodeInfo_submsgs[0], + &google_protobuf_GeneratedCodeInfo__submsgs[0], &google_protobuf_GeneratedCodeInfo__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, #ifdef UPB_TRACING_ENABLED @@ -10095,8 +10101,8 @@ const upb_MiniTable google__protobuf__GeneratedCodeInfo_msg_init = { }; const upb_MiniTable* google__protobuf__GeneratedCodeInfo_msg_init_ptr = &google__protobuf__GeneratedCodeInfo_msg_init; -static const upb_MiniTableSubInternal google_protobuf_GeneratedCodeInfo_Annotation_submsgs[1] = { - {.UPB_PRIVATE(subenum) = &google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init}, +static const upb_MiniTableSubInternal google_protobuf_GeneratedCodeInfo_Annotation__submsgs[1] = { + {.UPB_PRIVATE(subenum) = &google__protobuf__GeneratedCodeInfo__Annotation__Semantic_enum_init}, }; static const upb_MiniTableField google_protobuf_GeneratedCodeInfo_Annotation__fields[5] = { @@ -10108,7 +10114,7 @@ static const upb_MiniTableField google_protobuf_GeneratedCodeInfo_Annotation__fi }; const upb_MiniTable google__protobuf__GeneratedCodeInfo__Annotation_msg_init = { - &google_protobuf_GeneratedCodeInfo_Annotation_submsgs[0], + &google_protobuf_GeneratedCodeInfo_Annotation__submsgs[0], &google_protobuf_GeneratedCodeInfo_Annotation__fields[0], UPB_SIZE(40, 48), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(8), 0, #ifdef UPB_TRACING_ENABLED @@ -10121,7 +10127,7 @@ const upb_MiniTable google__protobuf__GeneratedCodeInfo__Annotation_msg_init = { }; const upb_MiniTable* google__protobuf__GeneratedCodeInfo__Annotation_msg_init_ptr = &google__protobuf__GeneratedCodeInfo__Annotation_msg_init; -const upb_MiniTableEnum google_protobuf_Edition_enum_init = { +const upb_MiniTableEnum google__protobuf__Edition_enum_init = { 64, 9, { @@ -10139,7 +10145,7 @@ const upb_MiniTableEnum google_protobuf_Edition_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_ExtensionRangeOptions_VerificationState_enum_init = { +const upb_MiniTableEnum google__protobuf__ExtensionRangeOptions__VerificationState_enum_init = { 64, 0, { @@ -10148,7 +10154,7 @@ const upb_MiniTableEnum google_protobuf_ExtensionRangeOptions_VerificationState_ }, }; -const upb_MiniTableEnum google_protobuf_FeatureSet_EnumType_enum_init = { +const upb_MiniTableEnum google__protobuf__FeatureSet__EnumType_enum_init = { 64, 0, { @@ -10157,7 +10163,7 @@ const upb_MiniTableEnum google_protobuf_FeatureSet_EnumType_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_FeatureSet_FieldPresence_enum_init = { +const upb_MiniTableEnum google__protobuf__FeatureSet__FieldPresence_enum_init = { 64, 0, { @@ -10166,7 +10172,7 @@ const upb_MiniTableEnum google_protobuf_FeatureSet_FieldPresence_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_FeatureSet_JsonFormat_enum_init = { +const upb_MiniTableEnum google__protobuf__FeatureSet__JsonFormat_enum_init = { 64, 0, { @@ -10175,7 +10181,7 @@ const upb_MiniTableEnum google_protobuf_FeatureSet_JsonFormat_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_FeatureSet_MessageEncoding_enum_init = { +const upb_MiniTableEnum google__protobuf__FeatureSet__MessageEncoding_enum_init = { 64, 0, { @@ -10184,7 +10190,7 @@ const upb_MiniTableEnum google_protobuf_FeatureSet_MessageEncoding_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init = { +const upb_MiniTableEnum google__protobuf__FeatureSet__RepeatedFieldEncoding_enum_init = { 64, 0, { @@ -10193,7 +10199,7 @@ const upb_MiniTableEnum google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_in }, }; -const upb_MiniTableEnum google_protobuf_FeatureSet_Utf8Validation_enum_init = { +const upb_MiniTableEnum google__protobuf__FeatureSet__Utf8Validation_enum_init = { 64, 0, { @@ -10202,7 +10208,7 @@ const upb_MiniTableEnum google_protobuf_FeatureSet_Utf8Validation_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Label_enum_init = { +const upb_MiniTableEnum google__protobuf__FieldDescriptorProto__Label_enum_init = { 64, 0, { @@ -10211,7 +10217,7 @@ const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Label_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Type_enum_init = { +const upb_MiniTableEnum google__protobuf__FieldDescriptorProto__Type_enum_init = { 64, 0, { @@ -10220,7 +10226,7 @@ const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Type_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_FieldOptions_CType_enum_init = { +const upb_MiniTableEnum google__protobuf__FieldOptions__CType_enum_init = { 64, 0, { @@ -10229,7 +10235,7 @@ const upb_MiniTableEnum google_protobuf_FieldOptions_CType_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_FieldOptions_JSType_enum_init = { +const upb_MiniTableEnum google__protobuf__FieldOptions__JSType_enum_init = { 64, 0, { @@ -10238,7 +10244,7 @@ const upb_MiniTableEnum google_protobuf_FieldOptions_JSType_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_FieldOptions_OptionRetention_enum_init = { +const upb_MiniTableEnum google__protobuf__FieldOptions__OptionRetention_enum_init = { 64, 0, { @@ -10247,7 +10253,7 @@ const upb_MiniTableEnum google_protobuf_FieldOptions_OptionRetention_enum_init = }, }; -const upb_MiniTableEnum google_protobuf_FieldOptions_OptionTargetType_enum_init = { +const upb_MiniTableEnum google__protobuf__FieldOptions__OptionTargetType_enum_init = { 64, 0, { @@ -10256,7 +10262,7 @@ const upb_MiniTableEnum google_protobuf_FieldOptions_OptionTargetType_enum_init }, }; -const upb_MiniTableEnum google_protobuf_FileOptions_OptimizeMode_enum_init = { +const upb_MiniTableEnum google__protobuf__FileOptions__OptimizeMode_enum_init = { 64, 0, { @@ -10265,7 +10271,7 @@ const upb_MiniTableEnum google_protobuf_FileOptions_OptimizeMode_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init = { +const upb_MiniTableEnum google__protobuf__GeneratedCodeInfo__Annotation__Semantic_enum_init = { 64, 0, { @@ -10274,7 +10280,7 @@ const upb_MiniTableEnum google_protobuf_GeneratedCodeInfo_Annotation_Semantic_en }, }; -const upb_MiniTableEnum google_protobuf_MethodOptions_IdempotencyLevel_enum_init = { +const upb_MiniTableEnum google__protobuf__MethodOptions__IdempotencyLevel_enum_init = { 64, 0, { @@ -10320,23 +10326,23 @@ static const upb_MiniTable *messages_layout[33] = { }; static const upb_MiniTableEnum *enums_layout[17] = { - &google_protobuf_Edition_enum_init, - &google_protobuf_ExtensionRangeOptions_VerificationState_enum_init, - &google_protobuf_FeatureSet_EnumType_enum_init, - &google_protobuf_FeatureSet_FieldPresence_enum_init, - &google_protobuf_FeatureSet_JsonFormat_enum_init, - &google_protobuf_FeatureSet_MessageEncoding_enum_init, - &google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init, - &google_protobuf_FeatureSet_Utf8Validation_enum_init, - &google_protobuf_FieldDescriptorProto_Label_enum_init, - &google_protobuf_FieldDescriptorProto_Type_enum_init, - &google_protobuf_FieldOptions_CType_enum_init, - &google_protobuf_FieldOptions_JSType_enum_init, - &google_protobuf_FieldOptions_OptionRetention_enum_init, - &google_protobuf_FieldOptions_OptionTargetType_enum_init, - &google_protobuf_FileOptions_OptimizeMode_enum_init, - &google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init, - &google_protobuf_MethodOptions_IdempotencyLevel_enum_init, + &google__protobuf__Edition_enum_init, + &google__protobuf__ExtensionRangeOptions__VerificationState_enum_init, + &google__protobuf__FeatureSet__EnumType_enum_init, + &google__protobuf__FeatureSet__FieldPresence_enum_init, + &google__protobuf__FeatureSet__JsonFormat_enum_init, + &google__protobuf__FeatureSet__MessageEncoding_enum_init, + &google__protobuf__FeatureSet__RepeatedFieldEncoding_enum_init, + &google__protobuf__FeatureSet__Utf8Validation_enum_init, + &google__protobuf__FieldDescriptorProto__Label_enum_init, + &google__protobuf__FieldDescriptorProto__Type_enum_init, + &google__protobuf__FieldOptions__CType_enum_init, + &google__protobuf__FieldOptions__JSType_enum_init, + &google__protobuf__FieldOptions__OptionRetention_enum_init, + &google__protobuf__FieldOptions__OptionTargetType_enum_init, + &google__protobuf__FileOptions__OptimizeMode_enum_init, + &google__protobuf__GeneratedCodeInfo__Annotation__Semantic_enum_init, + &google__protobuf__MethodOptions__IdempotencyLevel_enum_init, }; const upb_MiniTableFile google_protobuf_descriptor_proto_upb_file_layout = { @@ -16567,6 +16573,7 @@ upb_ServiceDef* _upb_ServiceDefs_New(upb_DefBuilder* ctx, int n, #undef UPB_EXPORT #undef UPB_INLINE #undef UPB_API +#undef UPBC_API #undef UPB_API_INLINE #undef UPB_ALIGN_UP #undef UPB_ALIGN_DOWN diff --git a/ruby/ext/google/protobuf_c/ruby-upb.h b/ruby/ext/google/protobuf_c/ruby-upb.h index 2cd05c1be6..f870ed0dcf 100755 --- a/ruby/ext/google/protobuf_c/ruby-upb.h +++ b/ruby/ext/google/protobuf_c/ruby-upb.h @@ -87,6 +87,12 @@ Error, UINTPTR_MAX is undefined #define UPB_API_INLINE UPB_INLINE #endif +#ifdef EXPORT_UPBC +#define UPBC_API UPB_EXPORT +#else +#define UPBC_API +#endif + #define UPB_MALLOC_ALIGN 8 #define UPB_ALIGN_UP(size, align) (((size) + (align) - 1) / (align) * (align)) #define UPB_ALIGN_DOWN(size, align) ((size) / (align) * (align)) @@ -1205,8 +1211,8 @@ UPB_INLINE bool upb_StringView_IsEqual(upb_StringView a, upb_StringView b) { * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_ -#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_ +#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_H_ +#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_H_ #ifndef UPB_GENERATED_CODE_SUPPORT_H_ @@ -5332,8 +5338,8 @@ TAGBYTES(r) * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_MINITABLE_H_ -#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_MINITABLE_H_ +#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_MINITABLE_H_ +#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_MINITABLE_H_ // Must be last. @@ -5409,23 +5415,23 @@ extern const upb_MiniTable* google__protobuf__GeneratedCodeInfo_msg_init_ptr; extern const upb_MiniTable google__protobuf__GeneratedCodeInfo__Annotation_msg_init; extern const upb_MiniTable* google__protobuf__GeneratedCodeInfo__Annotation_msg_init_ptr; -extern const upb_MiniTableEnum google_protobuf_Edition_enum_init; -extern const upb_MiniTableEnum google_protobuf_ExtensionRangeOptions_VerificationState_enum_init; -extern const upb_MiniTableEnum google_protobuf_FeatureSet_EnumType_enum_init; -extern const upb_MiniTableEnum google_protobuf_FeatureSet_FieldPresence_enum_init; -extern const upb_MiniTableEnum google_protobuf_FeatureSet_JsonFormat_enum_init; -extern const upb_MiniTableEnum google_protobuf_FeatureSet_MessageEncoding_enum_init; -extern const upb_MiniTableEnum google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init; -extern const upb_MiniTableEnum google_protobuf_FeatureSet_Utf8Validation_enum_init; -extern const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Label_enum_init; -extern const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Type_enum_init; -extern const upb_MiniTableEnum google_protobuf_FieldOptions_CType_enum_init; -extern const upb_MiniTableEnum google_protobuf_FieldOptions_JSType_enum_init; -extern const upb_MiniTableEnum google_protobuf_FieldOptions_OptionRetention_enum_init; -extern const upb_MiniTableEnum google_protobuf_FieldOptions_OptionTargetType_enum_init; -extern const upb_MiniTableEnum google_protobuf_FileOptions_OptimizeMode_enum_init; -extern const upb_MiniTableEnum google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init; -extern const upb_MiniTableEnum google_protobuf_MethodOptions_IdempotencyLevel_enum_init; +extern const upb_MiniTableEnum google__protobuf__Edition_enum_init; +extern const upb_MiniTableEnum google__protobuf__ExtensionRangeOptions__VerificationState_enum_init; +extern const upb_MiniTableEnum google__protobuf__FeatureSet__EnumType_enum_init; +extern const upb_MiniTableEnum google__protobuf__FeatureSet__FieldPresence_enum_init; +extern const upb_MiniTableEnum google__protobuf__FeatureSet__JsonFormat_enum_init; +extern const upb_MiniTableEnum google__protobuf__FeatureSet__MessageEncoding_enum_init; +extern const upb_MiniTableEnum google__protobuf__FeatureSet__RepeatedFieldEncoding_enum_init; +extern const upb_MiniTableEnum google__protobuf__FeatureSet__Utf8Validation_enum_init; +extern const upb_MiniTableEnum google__protobuf__FieldDescriptorProto__Label_enum_init; +extern const upb_MiniTableEnum google__protobuf__FieldDescriptorProto__Type_enum_init; +extern const upb_MiniTableEnum google__protobuf__FieldOptions__CType_enum_init; +extern const upb_MiniTableEnum google__protobuf__FieldOptions__JSType_enum_init; +extern const upb_MiniTableEnum google__protobuf__FieldOptions__OptionRetention_enum_init; +extern const upb_MiniTableEnum google__protobuf__FieldOptions__OptionTargetType_enum_init; +extern const upb_MiniTableEnum google__protobuf__FileOptions__OptimizeMode_enum_init; +extern const upb_MiniTableEnum google__protobuf__GeneratedCodeInfo__Annotation__Semantic_enum_init; +extern const upb_MiniTableEnum google__protobuf__MethodOptions__IdempotencyLevel_enum_init; extern const upb_MiniTableFile google_protobuf_descriptor_proto_upb_file_layout; #ifdef __cplusplus @@ -5433,7 +5439,7 @@ extern const upb_MiniTableFile google_protobuf_descriptor_proto_upb_file_layout; #endif -#endif /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_MINITABLE_H_ */ +#endif /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_MINITABLE_H_ */ // Must be last. @@ -12314,7 +12320,7 @@ UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_semantic(google #endif -#endif /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_ */ +#endif /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_H_ */ #endif // IWYU pragma: end_exports @@ -15081,6 +15087,7 @@ upb_MethodDef* _upb_MethodDefs_New(upb_DefBuilder* ctx, int n, #undef UPB_EXPORT #undef UPB_INLINE #undef UPB_API +#undef UPBC_API #undef UPB_API_INLINE #undef UPB_ALIGN_UP #undef UPB_ALIGN_DOWN diff --git a/src/file_lists.cmake b/src/file_lists.cmake index 4ddd89dc53..b6106481eb 100644 --- a/src/file_lists.cmake +++ b/src/file_lists.cmake @@ -416,7 +416,9 @@ set(libprotoc_srcs ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/versions.cc ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/zip_writer.cc ${protobuf_SOURCE_DIR}/src/google/protobuf/testing/file.cc - ${protobuf_SOURCE_DIR}/upb_generator/mangle.cc + ${protobuf_SOURCE_DIR}/upb_generator/common/names.cc + ${protobuf_SOURCE_DIR}/upb_generator/minitable/names.cc + ${protobuf_SOURCE_DIR}/upb_generator/minitable/names_internal.cc ) # @//pkg:protoc @@ -548,7 +550,13 @@ set(libprotoc_hdrs ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/versions.h ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/zip_writer.h ${protobuf_SOURCE_DIR}/src/google/protobuf/testing/file.h - ${protobuf_SOURCE_DIR}/upb_generator/mangle.h + ${protobuf_SOURCE_DIR}/upb/port/atomic.h + ${protobuf_SOURCE_DIR}/upb/port/def.inc + ${protobuf_SOURCE_DIR}/upb/port/undef.inc + ${protobuf_SOURCE_DIR}/upb/port/vsnprintf_compat.h + ${protobuf_SOURCE_DIR}/upb_generator/common/names.h + ${protobuf_SOURCE_DIR}/upb_generator/minitable/names.h + ${protobuf_SOURCE_DIR}/upb_generator/minitable/names_internal.h ) # @//pkg:upb @@ -737,10 +745,13 @@ set(protoc-gen-upb_srcs ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/code_generator_lite.cc ${protobuf_SOURCE_DIR}/src/google/protobuf/port.cc ${protobuf_SOURCE_DIR}/upb_generator/c/generator.cc + ${protobuf_SOURCE_DIR}/upb_generator/c/names.cc + ${protobuf_SOURCE_DIR}/upb_generator/c/names_internal.cc ${protobuf_SOURCE_DIR}/upb_generator/common.cc + ${protobuf_SOURCE_DIR}/upb_generator/common/names.cc ${protobuf_SOURCE_DIR}/upb_generator/file_layout.cc - ${protobuf_SOURCE_DIR}/upb_generator/mangle.cc - ${protobuf_SOURCE_DIR}/upb_generator/names.cc + ${protobuf_SOURCE_DIR}/upb_generator/minitable/names.cc + ${protobuf_SOURCE_DIR}/upb_generator/minitable/names_internal.cc ) # @//pkg:protoc-gen-upb @@ -749,10 +760,13 @@ set(protoc-gen-upb_hdrs ${protobuf_SOURCE_DIR}/src/google/protobuf/port.h ${protobuf_SOURCE_DIR}/src/google/protobuf/port_def.inc ${protobuf_SOURCE_DIR}/src/google/protobuf/port_undef.inc + ${protobuf_SOURCE_DIR}/upb_generator/c/names.h + ${protobuf_SOURCE_DIR}/upb_generator/c/names_internal.h ${protobuf_SOURCE_DIR}/upb_generator/common.h + ${protobuf_SOURCE_DIR}/upb_generator/common/names.h ${protobuf_SOURCE_DIR}/upb_generator/file_layout.h - ${protobuf_SOURCE_DIR}/upb_generator/mangle.h - ${protobuf_SOURCE_DIR}/upb_generator/names.h + ${protobuf_SOURCE_DIR}/upb_generator/minitable/names.h + ${protobuf_SOURCE_DIR}/upb_generator/minitable/names_internal.h ${protobuf_SOURCE_DIR}/upb_generator/plugin.h ${protobuf_SOURCE_DIR}/upb_generator/plugin_bootstrap.h ) @@ -762,9 +776,12 @@ set(protoc-gen-upbdefs_srcs ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/code_generator_lite.cc ${protobuf_SOURCE_DIR}/src/google/protobuf/port.cc ${protobuf_SOURCE_DIR}/upb_generator/common.cc + ${protobuf_SOURCE_DIR}/upb_generator/common/names.cc ${protobuf_SOURCE_DIR}/upb_generator/file_layout.cc - ${protobuf_SOURCE_DIR}/upb_generator/mangle.cc + ${protobuf_SOURCE_DIR}/upb_generator/minitable/names.cc + ${protobuf_SOURCE_DIR}/upb_generator/minitable/names_internal.cc ${protobuf_SOURCE_DIR}/upb_generator/reflection/generator.cc + ${protobuf_SOURCE_DIR}/upb_generator/reflection/names.cc ) # @//pkg:protoc-gen-upbdefs @@ -774,10 +791,13 @@ set(protoc-gen-upbdefs_hdrs ${protobuf_SOURCE_DIR}/src/google/protobuf/port_def.inc ${protobuf_SOURCE_DIR}/src/google/protobuf/port_undef.inc ${protobuf_SOURCE_DIR}/upb_generator/common.h + ${protobuf_SOURCE_DIR}/upb_generator/common/names.h ${protobuf_SOURCE_DIR}/upb_generator/file_layout.h - ${protobuf_SOURCE_DIR}/upb_generator/mangle.h + ${protobuf_SOURCE_DIR}/upb_generator/minitable/names.h + ${protobuf_SOURCE_DIR}/upb_generator/minitable/names_internal.h ${protobuf_SOURCE_DIR}/upb_generator/plugin.h ${protobuf_SOURCE_DIR}/upb_generator/plugin_bootstrap.h + ${protobuf_SOURCE_DIR}/upb_generator/reflection/names.h ) # @//pkg:protoc-gen-upb_minitable @@ -785,12 +805,13 @@ set(protoc-gen-upb_minitable_srcs ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/code_generator_lite.cc ${protobuf_SOURCE_DIR}/src/google/protobuf/port.cc ${protobuf_SOURCE_DIR}/upb_generator/common.cc + ${protobuf_SOURCE_DIR}/upb_generator/common/names.cc ${protobuf_SOURCE_DIR}/upb_generator/file_layout.cc - ${protobuf_SOURCE_DIR}/upb_generator/mangle.cc ${protobuf_SOURCE_DIR}/upb_generator/minitable/fasttable.cc ${protobuf_SOURCE_DIR}/upb_generator/minitable/generator.cc ${protobuf_SOURCE_DIR}/upb_generator/minitable/main.cc - ${protobuf_SOURCE_DIR}/upb_generator/names.cc + ${protobuf_SOURCE_DIR}/upb_generator/minitable/names.cc + ${protobuf_SOURCE_DIR}/upb_generator/minitable/names_internal.cc ) # @//pkg:protoc-gen-upb_minitable @@ -800,10 +821,11 @@ set(protoc-gen-upb_minitable_hdrs ${protobuf_SOURCE_DIR}/src/google/protobuf/port_def.inc ${protobuf_SOURCE_DIR}/src/google/protobuf/port_undef.inc ${protobuf_SOURCE_DIR}/upb_generator/common.h + ${protobuf_SOURCE_DIR}/upb_generator/common/names.h ${protobuf_SOURCE_DIR}/upb_generator/file_layout.h - ${protobuf_SOURCE_DIR}/upb_generator/mangle.h ${protobuf_SOURCE_DIR}/upb_generator/minitable/generator.h - ${protobuf_SOURCE_DIR}/upb_generator/names.h + ${protobuf_SOURCE_DIR}/upb_generator/minitable/names.h + ${protobuf_SOURCE_DIR}/upb_generator/minitable/names_internal.h ${protobuf_SOURCE_DIR}/upb_generator/plugin.h ${protobuf_SOURCE_DIR}/upb_generator/plugin_bootstrap.h ) diff --git a/upb/cmake/google/protobuf/descriptor.upb.h b/upb/cmake/google/protobuf/descriptor.upb.h index c0b8c61910..736f42fe5a 100644 --- a/upb/cmake/google/protobuf/descriptor.upb.h +++ b/upb/cmake/google/protobuf/descriptor.upb.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_ -#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_ +#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_H_ +#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -6894,4 +6894,4 @@ UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_semantic(google #include "upb/port/undef.inc" -#endif /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_ */ +#endif /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_H_ */ diff --git a/upb/cmake/google/protobuf/descriptor.upb_minitable.c b/upb/cmake/google/protobuf/descriptor.upb_minitable.c index 08fa451f75..b08864e929 100644 --- a/upb/cmake/google/protobuf/descriptor.upb_minitable.c +++ b/upb/cmake/google/protobuf/descriptor.upb_minitable.c @@ -14,7 +14,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal google_protobuf_FileDescriptorSet_submsgs[1] = { +static const upb_MiniTableSubInternal google_protobuf_FileDescriptorSet__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FileDescriptorProto_msg_init_ptr}, }; @@ -23,7 +23,7 @@ static const upb_MiniTableField google_protobuf_FileDescriptorSet__fields[1] = { }; const upb_MiniTable google__protobuf__FileDescriptorSet_msg_init = { - &google_protobuf_FileDescriptorSet_submsgs[0], + &google_protobuf_FileDescriptorSet__submsgs[0], &google_protobuf_FileDescriptorSet__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, #ifdef UPB_TRACING_ENABLED @@ -36,14 +36,14 @@ const upb_MiniTable google__protobuf__FileDescriptorSet_msg_init = { }; const upb_MiniTable* google__protobuf__FileDescriptorSet_msg_init_ptr = &google__protobuf__FileDescriptorSet_msg_init; -static const upb_MiniTableSubInternal google_protobuf_FileDescriptorProto_submsgs[7] = { +static const upb_MiniTableSubInternal google_protobuf_FileDescriptorProto__submsgs[7] = { {.UPB_PRIVATE(submsg) = &google__protobuf__DescriptorProto_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__EnumDescriptorProto_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__ServiceDescriptorProto_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__FieldDescriptorProto_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__FileOptions_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__SourceCodeInfo_msg_init_ptr}, - {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init}, }; static const upb_MiniTableField google_protobuf_FileDescriptorProto__fields[13] = { @@ -63,7 +63,7 @@ static const upb_MiniTableField google_protobuf_FileDescriptorProto__fields[13] }; const upb_MiniTable google__protobuf__FileDescriptorProto_msg_init = { - &google_protobuf_FileDescriptorProto_submsgs[0], + &google_protobuf_FileDescriptorProto__submsgs[0], &google_protobuf_FileDescriptorProto__fields[0], UPB_SIZE(80, 136), 13, kUpb_ExtMode_NonExtendable, 12, UPB_FASTTABLE_MASK(120), 0, #ifdef UPB_TRACING_ENABLED @@ -90,7 +90,7 @@ const upb_MiniTable google__protobuf__FileDescriptorProto_msg_init = { }; const upb_MiniTable* google__protobuf__FileDescriptorProto_msg_init_ptr = &google__protobuf__FileDescriptorProto_msg_init; -static const upb_MiniTableSubInternal google_protobuf_DescriptorProto_submsgs[8] = { +static const upb_MiniTableSubInternal google_protobuf_DescriptorProto__submsgs[8] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FieldDescriptorProto_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__DescriptorProto_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__EnumDescriptorProto_msg_init_ptr}, @@ -115,7 +115,7 @@ static const upb_MiniTableField google_protobuf_DescriptorProto__fields[10] = { }; const upb_MiniTable google__protobuf__DescriptorProto_msg_init = { - &google_protobuf_DescriptorProto_submsgs[0], + &google_protobuf_DescriptorProto__submsgs[0], &google_protobuf_DescriptorProto__fields[0], UPB_SIZE(56, 104), 10, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(120), 0, #ifdef UPB_TRACING_ENABLED @@ -142,7 +142,7 @@ const upb_MiniTable google__protobuf__DescriptorProto_msg_init = { }; const upb_MiniTable* google__protobuf__DescriptorProto_msg_init_ptr = &google__protobuf__DescriptorProto_msg_init; -static const upb_MiniTableSubInternal google_protobuf_DescriptorProto_ExtensionRange_submsgs[1] = { +static const upb_MiniTableSubInternal google_protobuf_DescriptorProto_ExtensionRange__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__ExtensionRangeOptions_msg_init_ptr}, }; @@ -153,7 +153,7 @@ static const upb_MiniTableField google_protobuf_DescriptorProto_ExtensionRange__ }; const upb_MiniTable google__protobuf__DescriptorProto__ExtensionRange_msg_init = { - &google_protobuf_DescriptorProto_ExtensionRange_submsgs[0], + &google_protobuf_DescriptorProto_ExtensionRange__submsgs[0], &google_protobuf_DescriptorProto_ExtensionRange__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(255), 0, #ifdef UPB_TRACING_ENABLED @@ -177,11 +177,11 @@ const upb_MiniTable google__protobuf__DescriptorProto__ReservedRange_msg_init = }; const upb_MiniTable* google__protobuf__DescriptorProto__ReservedRange_msg_init_ptr = &google__protobuf__DescriptorProto__ReservedRange_msg_init; -static const upb_MiniTableSubInternal google_protobuf_ExtensionRangeOptions_submsgs[4] = { +static const upb_MiniTableSubInternal google_protobuf_ExtensionRangeOptions__submsgs[4] = { {.UPB_PRIVATE(submsg) = &google__protobuf__ExtensionRangeOptions__Declaration_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, - {.UPB_PRIVATE(subenum) = &google_protobuf_ExtensionRangeOptions_VerificationState_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__ExtensionRangeOptions__VerificationState_enum_init}, }; static const upb_MiniTableField google_protobuf_ExtensionRangeOptions__fields[4] = { @@ -192,7 +192,7 @@ static const upb_MiniTableField google_protobuf_ExtensionRangeOptions__fields[4] }; const upb_MiniTable google__protobuf__ExtensionRangeOptions_msg_init = { - &google_protobuf_ExtensionRangeOptions_submsgs[0], + &google_protobuf_ExtensionRangeOptions__submsgs[0], &google_protobuf_ExtensionRangeOptions__fields[0], UPB_SIZE(32, 40), 4, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0, #ifdef UPB_TRACING_ENABLED @@ -253,10 +253,10 @@ const upb_MiniTable google__protobuf__ExtensionRangeOptions__Declaration_msg_ini }; const upb_MiniTable* google__protobuf__ExtensionRangeOptions__Declaration_msg_init_ptr = &google__protobuf__ExtensionRangeOptions__Declaration_msg_init; -static const upb_MiniTableSubInternal google_protobuf_FieldDescriptorProto_submsgs[3] = { +static const upb_MiniTableSubInternal google_protobuf_FieldDescriptorProto__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions_msg_init_ptr}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FieldDescriptorProto_Label_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FieldDescriptorProto_Type_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FieldDescriptorProto__Label_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FieldDescriptorProto__Type_enum_init}, }; static const upb_MiniTableField google_protobuf_FieldDescriptorProto__fields[11] = { @@ -274,7 +274,7 @@ static const upb_MiniTableField google_protobuf_FieldDescriptorProto__fields[11] }; const upb_MiniTable google__protobuf__FieldDescriptorProto_msg_init = { - &google_protobuf_FieldDescriptorProto_submsgs[0], + &google_protobuf_FieldDescriptorProto__submsgs[0], &google_protobuf_FieldDescriptorProto__fields[0], UPB_SIZE(80, 120), 11, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(255), 0, #ifdef UPB_TRACING_ENABLED @@ -283,7 +283,7 @@ const upb_MiniTable google__protobuf__FieldDescriptorProto_msg_init = { }; const upb_MiniTable* google__protobuf__FieldDescriptorProto_msg_init_ptr = &google__protobuf__FieldDescriptorProto_msg_init; -static const upb_MiniTableSubInternal google_protobuf_OneofDescriptorProto_submsgs[1] = { +static const upb_MiniTableSubInternal google_protobuf_OneofDescriptorProto__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__OneofOptions_msg_init_ptr}, }; @@ -293,7 +293,7 @@ static const upb_MiniTableField google_protobuf_OneofDescriptorProto__fields[2] }; const upb_MiniTable google__protobuf__OneofDescriptorProto_msg_init = { - &google_protobuf_OneofDescriptorProto_submsgs[0], + &google_protobuf_OneofDescriptorProto__submsgs[0], &google_protobuf_OneofDescriptorProto__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, #ifdef UPB_TRACING_ENABLED @@ -302,7 +302,7 @@ const upb_MiniTable google__protobuf__OneofDescriptorProto_msg_init = { }; const upb_MiniTable* google__protobuf__OneofDescriptorProto_msg_init_ptr = &google__protobuf__OneofDescriptorProto_msg_init; -static const upb_MiniTableSubInternal google_protobuf_EnumDescriptorProto_submsgs[3] = { +static const upb_MiniTableSubInternal google_protobuf_EnumDescriptorProto__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__EnumValueDescriptorProto_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__EnumOptions_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init_ptr}, @@ -317,7 +317,7 @@ static const upb_MiniTableField google_protobuf_EnumDescriptorProto__fields[5] = }; const upb_MiniTable google__protobuf__EnumDescriptorProto_msg_init = { - &google_protobuf_EnumDescriptorProto_submsgs[0], + &google_protobuf_EnumDescriptorProto__submsgs[0], &google_protobuf_EnumDescriptorProto__fields[0], UPB_SIZE(40, 64), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, #ifdef UPB_TRACING_ENABLED @@ -351,7 +351,7 @@ const upb_MiniTable google__protobuf__EnumDescriptorProto__EnumReservedRange_msg }; const upb_MiniTable* google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init_ptr = &google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init; -static const upb_MiniTableSubInternal google_protobuf_EnumValueDescriptorProto_submsgs[1] = { +static const upb_MiniTableSubInternal google_protobuf_EnumValueDescriptorProto__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__EnumValueOptions_msg_init_ptr}, }; @@ -362,7 +362,7 @@ static const upb_MiniTableField google_protobuf_EnumValueDescriptorProto__fields }; const upb_MiniTable google__protobuf__EnumValueDescriptorProto_msg_init = { - &google_protobuf_EnumValueDescriptorProto_submsgs[0], + &google_protobuf_EnumValueDescriptorProto__submsgs[0], &google_protobuf_EnumValueDescriptorProto__fields[0], UPB_SIZE(32, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(255), 0, #ifdef UPB_TRACING_ENABLED @@ -371,7 +371,7 @@ const upb_MiniTable google__protobuf__EnumValueDescriptorProto_msg_init = { }; const upb_MiniTable* google__protobuf__EnumValueDescriptorProto_msg_init_ptr = &google__protobuf__EnumValueDescriptorProto_msg_init; -static const upb_MiniTableSubInternal google_protobuf_ServiceDescriptorProto_submsgs[2] = { +static const upb_MiniTableSubInternal google_protobuf_ServiceDescriptorProto__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__MethodDescriptorProto_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__ServiceOptions_msg_init_ptr}, }; @@ -383,7 +383,7 @@ static const upb_MiniTableField google_protobuf_ServiceDescriptorProto__fields[3 }; const upb_MiniTable google__protobuf__ServiceDescriptorProto_msg_init = { - &google_protobuf_ServiceDescriptorProto_submsgs[0], + &google_protobuf_ServiceDescriptorProto__submsgs[0], &google_protobuf_ServiceDescriptorProto__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, #ifdef UPB_TRACING_ENABLED @@ -398,7 +398,7 @@ const upb_MiniTable google__protobuf__ServiceDescriptorProto_msg_init = { }; const upb_MiniTable* google__protobuf__ServiceDescriptorProto_msg_init_ptr = &google__protobuf__ServiceDescriptorProto_msg_init; -static const upb_MiniTableSubInternal google_protobuf_MethodDescriptorProto_submsgs[1] = { +static const upb_MiniTableSubInternal google_protobuf_MethodDescriptorProto__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__MethodOptions_msg_init_ptr}, }; @@ -412,7 +412,7 @@ static const upb_MiniTableField google_protobuf_MethodDescriptorProto__fields[6] }; const upb_MiniTable google__protobuf__MethodDescriptorProto_msg_init = { - &google_protobuf_MethodDescriptorProto_submsgs[0], + &google_protobuf_MethodDescriptorProto__submsgs[0], &google_protobuf_MethodDescriptorProto__fields[0], UPB_SIZE(48, 72), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(255), 0, #ifdef UPB_TRACING_ENABLED @@ -421,10 +421,10 @@ const upb_MiniTable google__protobuf__MethodDescriptorProto_msg_init = { }; const upb_MiniTable* google__protobuf__MethodDescriptorProto_msg_init_ptr = &google__protobuf__MethodDescriptorProto_msg_init; -static const upb_MiniTableSubInternal google_protobuf_FileOptions_submsgs[3] = { +static const upb_MiniTableSubInternal google_protobuf_FileOptions__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FileOptions_OptimizeMode_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FileOptions__OptimizeMode_enum_init}, }; static const upb_MiniTableField google_protobuf_FileOptions__fields[21] = { @@ -452,7 +452,7 @@ static const upb_MiniTableField google_protobuf_FileOptions__fields[21] = { }; const upb_MiniTable google__protobuf__FileOptions_msg_init = { - &google_protobuf_FileOptions_submsgs[0], + &google_protobuf_FileOptions__submsgs[0], &google_protobuf_FileOptions__fields[0], UPB_SIZE(112, 200), 21, kUpb_ExtMode_Extendable, 1, UPB_FASTTABLE_MASK(248), 0, #ifdef UPB_TRACING_ENABLED @@ -495,7 +495,7 @@ const upb_MiniTable google__protobuf__FileOptions_msg_init = { }; const upb_MiniTable* google__protobuf__FileOptions_msg_init_ptr = &google__protobuf__FileOptions_msg_init; -static const upb_MiniTableSubInternal google_protobuf_MessageOptions_submsgs[2] = { +static const upb_MiniTableSubInternal google_protobuf_MessageOptions__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, }; @@ -511,7 +511,7 @@ static const upb_MiniTableField google_protobuf_MessageOptions__fields[7] = { }; const upb_MiniTable google__protobuf__MessageOptions_msg_init = { - &google_protobuf_MessageOptions_submsgs[0], + &google_protobuf_MessageOptions__submsgs[0], &google_protobuf_MessageOptions__fields[0], UPB_SIZE(24, 32), 7, kUpb_ExtMode_Extendable, 3, UPB_FASTTABLE_MASK(248), 0, #ifdef UPB_TRACING_ENABLED @@ -554,15 +554,15 @@ const upb_MiniTable google__protobuf__MessageOptions_msg_init = { }; const upb_MiniTable* google__protobuf__MessageOptions_msg_init_ptr = &google__protobuf__MessageOptions_msg_init; -static const upb_MiniTableSubInternal google_protobuf_FieldOptions_submsgs[8] = { +static const upb_MiniTableSubInternal google_protobuf_FieldOptions__submsgs[8] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions__EditionDefault_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions__FeatureSupport_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FieldOptions_CType_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FieldOptions_JSType_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FieldOptions_OptionRetention_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FieldOptions_OptionTargetType_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FieldOptions__CType_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FieldOptions__JSType_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FieldOptions__OptionRetention_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FieldOptions__OptionTargetType_enum_init}, }; static const upb_MiniTableField google_protobuf_FieldOptions__fields[14] = { @@ -583,7 +583,7 @@ static const upb_MiniTableField google_protobuf_FieldOptions__fields[14] = { }; const upb_MiniTable google__protobuf__FieldOptions_msg_init = { - &google_protobuf_FieldOptions_submsgs[0], + &google_protobuf_FieldOptions__submsgs[0], &google_protobuf_FieldOptions__fields[0], UPB_SIZE(56, 72), 14, kUpb_ExtMode_Extendable, 3, UPB_FASTTABLE_MASK(248), 0, #ifdef UPB_TRACING_ENABLED @@ -626,8 +626,8 @@ const upb_MiniTable google__protobuf__FieldOptions_msg_init = { }; const upb_MiniTable* google__protobuf__FieldOptions_msg_init_ptr = &google__protobuf__FieldOptions_msg_init; -static const upb_MiniTableSubInternal google_protobuf_FieldOptions_EditionDefault_submsgs[1] = { - {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, +static const upb_MiniTableSubInternal google_protobuf_FieldOptions_EditionDefault__submsgs[1] = { + {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init}, }; static const upb_MiniTableField google_protobuf_FieldOptions_EditionDefault__fields[2] = { @@ -636,7 +636,7 @@ static const upb_MiniTableField google_protobuf_FieldOptions_EditionDefault__fie }; const upb_MiniTable google__protobuf__FieldOptions__EditionDefault_msg_init = { - &google_protobuf_FieldOptions_EditionDefault_submsgs[0], + &google_protobuf_FieldOptions_EditionDefault__submsgs[0], &google_protobuf_FieldOptions_EditionDefault__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, #ifdef UPB_TRACING_ENABLED @@ -645,10 +645,10 @@ const upb_MiniTable google__protobuf__FieldOptions__EditionDefault_msg_init = { }; const upb_MiniTable* google__protobuf__FieldOptions__EditionDefault_msg_init_ptr = &google__protobuf__FieldOptions__EditionDefault_msg_init; -static const upb_MiniTableSubInternal google_protobuf_FieldOptions_FeatureSupport_submsgs[3] = { - {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, +static const upb_MiniTableSubInternal google_protobuf_FieldOptions_FeatureSupport__submsgs[3] = { + {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init}, }; static const upb_MiniTableField google_protobuf_FieldOptions_FeatureSupport__fields[4] = { @@ -659,7 +659,7 @@ static const upb_MiniTableField google_protobuf_FieldOptions_FeatureSupport__fie }; const upb_MiniTable google__protobuf__FieldOptions__FeatureSupport_msg_init = { - &google_protobuf_FieldOptions_FeatureSupport_submsgs[0], + &google_protobuf_FieldOptions_FeatureSupport__submsgs[0], &google_protobuf_FieldOptions_FeatureSupport__fields[0], UPB_SIZE(32, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(255), 0, #ifdef UPB_TRACING_ENABLED @@ -668,7 +668,7 @@ const upb_MiniTable google__protobuf__FieldOptions__FeatureSupport_msg_init = { }; const upb_MiniTable* google__protobuf__FieldOptions__FeatureSupport_msg_init_ptr = &google__protobuf__FieldOptions__FeatureSupport_msg_init; -static const upb_MiniTableSubInternal google_protobuf_OneofOptions_submsgs[2] = { +static const upb_MiniTableSubInternal google_protobuf_OneofOptions__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, }; @@ -679,7 +679,7 @@ static const upb_MiniTableField google_protobuf_OneofOptions__fields[2] = { }; const upb_MiniTable google__protobuf__OneofOptions_msg_init = { - &google_protobuf_OneofOptions_submsgs[0], + &google_protobuf_OneofOptions__submsgs[0], &google_protobuf_OneofOptions__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_Extendable, 1, UPB_FASTTABLE_MASK(248), 0, #ifdef UPB_TRACING_ENABLED @@ -722,7 +722,7 @@ const upb_MiniTable google__protobuf__OneofOptions_msg_init = { }; const upb_MiniTable* google__protobuf__OneofOptions_msg_init_ptr = &google__protobuf__OneofOptions_msg_init; -static const upb_MiniTableSubInternal google_protobuf_EnumOptions_submsgs[2] = { +static const upb_MiniTableSubInternal google_protobuf_EnumOptions__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, }; @@ -736,7 +736,7 @@ static const upb_MiniTableField google_protobuf_EnumOptions__fields[5] = { }; const upb_MiniTable google__protobuf__EnumOptions_msg_init = { - &google_protobuf_EnumOptions_submsgs[0], + &google_protobuf_EnumOptions__submsgs[0], &google_protobuf_EnumOptions__fields[0], UPB_SIZE(24, 32), 5, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0, #ifdef UPB_TRACING_ENABLED @@ -779,7 +779,7 @@ const upb_MiniTable google__protobuf__EnumOptions_msg_init = { }; const upb_MiniTable* google__protobuf__EnumOptions_msg_init_ptr = &google__protobuf__EnumOptions_msg_init; -static const upb_MiniTableSubInternal google_protobuf_EnumValueOptions_submsgs[3] = { +static const upb_MiniTableSubInternal google_protobuf_EnumValueOptions__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions__FeatureSupport_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, @@ -794,7 +794,7 @@ static const upb_MiniTableField google_protobuf_EnumValueOptions__fields[5] = { }; const upb_MiniTable google__protobuf__EnumValueOptions_msg_init = { - &google_protobuf_EnumValueOptions_submsgs[0], + &google_protobuf_EnumValueOptions__submsgs[0], &google_protobuf_EnumValueOptions__fields[0], UPB_SIZE(32, 40), 5, kUpb_ExtMode_Extendable, 4, UPB_FASTTABLE_MASK(248), 0, #ifdef UPB_TRACING_ENABLED @@ -837,7 +837,7 @@ const upb_MiniTable google__protobuf__EnumValueOptions_msg_init = { }; const upb_MiniTable* google__protobuf__EnumValueOptions_msg_init_ptr = &google__protobuf__EnumValueOptions_msg_init; -static const upb_MiniTableSubInternal google_protobuf_ServiceOptions_submsgs[2] = { +static const upb_MiniTableSubInternal google_protobuf_ServiceOptions__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, }; @@ -849,7 +849,7 @@ static const upb_MiniTableField google_protobuf_ServiceOptions__fields[3] = { }; const upb_MiniTable google__protobuf__ServiceOptions_msg_init = { - &google_protobuf_ServiceOptions_submsgs[0], + &google_protobuf_ServiceOptions__submsgs[0], &google_protobuf_ServiceOptions__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0, #ifdef UPB_TRACING_ENABLED @@ -892,10 +892,10 @@ const upb_MiniTable google__protobuf__ServiceOptions_msg_init = { }; const upb_MiniTable* google__protobuf__ServiceOptions_msg_init_ptr = &google__protobuf__ServiceOptions_msg_init; -static const upb_MiniTableSubInternal google_protobuf_MethodOptions_submsgs[3] = { +static const upb_MiniTableSubInternal google_protobuf_MethodOptions__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, - {.UPB_PRIVATE(subenum) = &google_protobuf_MethodOptions_IdempotencyLevel_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__MethodOptions__IdempotencyLevel_enum_init}, }; static const upb_MiniTableField google_protobuf_MethodOptions__fields[4] = { @@ -906,7 +906,7 @@ static const upb_MiniTableField google_protobuf_MethodOptions__fields[4] = { }; const upb_MiniTable google__protobuf__MethodOptions_msg_init = { - &google_protobuf_MethodOptions_submsgs[0], + &google_protobuf_MethodOptions__submsgs[0], &google_protobuf_MethodOptions__fields[0], UPB_SIZE(24, 32), 4, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0, #ifdef UPB_TRACING_ENABLED @@ -949,7 +949,7 @@ const upb_MiniTable google__protobuf__MethodOptions_msg_init = { }; const upb_MiniTable* google__protobuf__MethodOptions_msg_init_ptr = &google__protobuf__MethodOptions_msg_init; -static const upb_MiniTableSubInternal google_protobuf_UninterpretedOption_submsgs[1] = { +static const upb_MiniTableSubInternal google_protobuf_UninterpretedOption__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption__NamePart_msg_init_ptr}, }; @@ -964,7 +964,7 @@ static const upb_MiniTableField google_protobuf_UninterpretedOption__fields[7] = }; const upb_MiniTable google__protobuf__UninterpretedOption_msg_init = { - &google_protobuf_UninterpretedOption_submsgs[0], + &google_protobuf_UninterpretedOption__submsgs[0], &google_protobuf_UninterpretedOption__fields[0], UPB_SIZE(64, 96), 7, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0, #ifdef UPB_TRACING_ENABLED @@ -994,13 +994,13 @@ const upb_MiniTable google__protobuf__UninterpretedOption__NamePart_msg_init = { }; const upb_MiniTable* google__protobuf__UninterpretedOption__NamePart_msg_init_ptr = &google__protobuf__UninterpretedOption__NamePart_msg_init; -static const upb_MiniTableSubInternal google_protobuf_FeatureSet_submsgs[6] = { - {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_FieldPresence_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_EnumType_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_Utf8Validation_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_MessageEncoding_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_JsonFormat_enum_init}, +static const upb_MiniTableSubInternal google_protobuf_FeatureSet__submsgs[6] = { + {.UPB_PRIVATE(subenum) = &google__protobuf__FeatureSet__FieldPresence_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FeatureSet__EnumType_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FeatureSet__RepeatedFieldEncoding_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FeatureSet__Utf8Validation_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FeatureSet__MessageEncoding_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FeatureSet__JsonFormat_enum_init}, }; static const upb_MiniTableField google_protobuf_FeatureSet__fields[6] = { @@ -1013,7 +1013,7 @@ static const upb_MiniTableField google_protobuf_FeatureSet__fields[6] = { }; const upb_MiniTable google__protobuf__FeatureSet_msg_init = { - &google_protobuf_FeatureSet_submsgs[0], + &google_protobuf_FeatureSet__submsgs[0], &google_protobuf_FeatureSet__fields[0], 40, 6, kUpb_ExtMode_Extendable, 6, UPB_FASTTABLE_MASK(255), 0, #ifdef UPB_TRACING_ENABLED @@ -1022,10 +1022,10 @@ const upb_MiniTable google__protobuf__FeatureSet_msg_init = { }; const upb_MiniTable* google__protobuf__FeatureSet_msg_init_ptr = &google__protobuf__FeatureSet_msg_init; -static const upb_MiniTableSubInternal google_protobuf_FeatureSetDefaults_submsgs[3] = { +static const upb_MiniTableSubInternal google_protobuf_FeatureSetDefaults__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init_ptr}, - {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init}, }; static const upb_MiniTableField google_protobuf_FeatureSetDefaults__fields[3] = { @@ -1035,7 +1035,7 @@ static const upb_MiniTableField google_protobuf_FeatureSetDefaults__fields[3] = }; const upb_MiniTable google__protobuf__FeatureSetDefaults_msg_init = { - &google_protobuf_FeatureSetDefaults_submsgs[0], + &google_protobuf_FeatureSetDefaults__submsgs[0], &google_protobuf_FeatureSetDefaults__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, #ifdef UPB_TRACING_ENABLED @@ -1048,10 +1048,10 @@ const upb_MiniTable google__protobuf__FeatureSetDefaults_msg_init = { }; const upb_MiniTable* google__protobuf__FeatureSetDefaults_msg_init_ptr = &google__protobuf__FeatureSetDefaults_msg_init; -static const upb_MiniTableSubInternal google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_submsgs[3] = { +static const upb_MiniTableSubInternal google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, - {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init}, }; static const upb_MiniTableField google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault__fields[3] = { @@ -1061,7 +1061,7 @@ static const upb_MiniTableField google_protobuf_FeatureSetDefaults_FeatureSetEdi }; const upb_MiniTable google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init = { - &google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_submsgs[0], + &google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault__submsgs[0], &google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, #ifdef UPB_TRACING_ENABLED @@ -1070,7 +1070,7 @@ const upb_MiniTable google__protobuf__FeatureSetDefaults__FeatureSetEditionDefau }; const upb_MiniTable* google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init_ptr = &google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init; -static const upb_MiniTableSubInternal google_protobuf_SourceCodeInfo_submsgs[1] = { +static const upb_MiniTableSubInternal google_protobuf_SourceCodeInfo__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__SourceCodeInfo__Location_msg_init_ptr}, }; @@ -1079,7 +1079,7 @@ static const upb_MiniTableField google_protobuf_SourceCodeInfo__fields[1] = { }; const upb_MiniTable google__protobuf__SourceCodeInfo_msg_init = { - &google_protobuf_SourceCodeInfo_submsgs[0], + &google_protobuf_SourceCodeInfo__submsgs[0], &google_protobuf_SourceCodeInfo__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, #ifdef UPB_TRACING_ENABLED @@ -1120,7 +1120,7 @@ const upb_MiniTable google__protobuf__SourceCodeInfo__Location_msg_init = { }; const upb_MiniTable* google__protobuf__SourceCodeInfo__Location_msg_init_ptr = &google__protobuf__SourceCodeInfo__Location_msg_init; -static const upb_MiniTableSubInternal google_protobuf_GeneratedCodeInfo_submsgs[1] = { +static const upb_MiniTableSubInternal google_protobuf_GeneratedCodeInfo__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__GeneratedCodeInfo__Annotation_msg_init_ptr}, }; @@ -1129,7 +1129,7 @@ static const upb_MiniTableField google_protobuf_GeneratedCodeInfo__fields[1] = { }; const upb_MiniTable google__protobuf__GeneratedCodeInfo_msg_init = { - &google_protobuf_GeneratedCodeInfo_submsgs[0], + &google_protobuf_GeneratedCodeInfo__submsgs[0], &google_protobuf_GeneratedCodeInfo__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, #ifdef UPB_TRACING_ENABLED @@ -1142,8 +1142,8 @@ const upb_MiniTable google__protobuf__GeneratedCodeInfo_msg_init = { }; const upb_MiniTable* google__protobuf__GeneratedCodeInfo_msg_init_ptr = &google__protobuf__GeneratedCodeInfo_msg_init; -static const upb_MiniTableSubInternal google_protobuf_GeneratedCodeInfo_Annotation_submsgs[1] = { - {.UPB_PRIVATE(subenum) = &google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init}, +static const upb_MiniTableSubInternal google_protobuf_GeneratedCodeInfo_Annotation__submsgs[1] = { + {.UPB_PRIVATE(subenum) = &google__protobuf__GeneratedCodeInfo__Annotation__Semantic_enum_init}, }; static const upb_MiniTableField google_protobuf_GeneratedCodeInfo_Annotation__fields[5] = { @@ -1155,7 +1155,7 @@ static const upb_MiniTableField google_protobuf_GeneratedCodeInfo_Annotation__fi }; const upb_MiniTable google__protobuf__GeneratedCodeInfo__Annotation_msg_init = { - &google_protobuf_GeneratedCodeInfo_Annotation_submsgs[0], + &google_protobuf_GeneratedCodeInfo_Annotation__submsgs[0], &google_protobuf_GeneratedCodeInfo_Annotation__fields[0], UPB_SIZE(40, 48), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(8), 0, #ifdef UPB_TRACING_ENABLED @@ -1168,7 +1168,7 @@ const upb_MiniTable google__protobuf__GeneratedCodeInfo__Annotation_msg_init = { }; const upb_MiniTable* google__protobuf__GeneratedCodeInfo__Annotation_msg_init_ptr = &google__protobuf__GeneratedCodeInfo__Annotation_msg_init; -const upb_MiniTableEnum google_protobuf_Edition_enum_init = { +const upb_MiniTableEnum google__protobuf__Edition_enum_init = { 64, 9, { @@ -1186,7 +1186,7 @@ const upb_MiniTableEnum google_protobuf_Edition_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_ExtensionRangeOptions_VerificationState_enum_init = { +const upb_MiniTableEnum google__protobuf__ExtensionRangeOptions__VerificationState_enum_init = { 64, 0, { @@ -1195,7 +1195,7 @@ const upb_MiniTableEnum google_protobuf_ExtensionRangeOptions_VerificationState_ }, }; -const upb_MiniTableEnum google_protobuf_FeatureSet_EnumType_enum_init = { +const upb_MiniTableEnum google__protobuf__FeatureSet__EnumType_enum_init = { 64, 0, { @@ -1204,7 +1204,7 @@ const upb_MiniTableEnum google_protobuf_FeatureSet_EnumType_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_FeatureSet_FieldPresence_enum_init = { +const upb_MiniTableEnum google__protobuf__FeatureSet__FieldPresence_enum_init = { 64, 0, { @@ -1213,7 +1213,7 @@ const upb_MiniTableEnum google_protobuf_FeatureSet_FieldPresence_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_FeatureSet_JsonFormat_enum_init = { +const upb_MiniTableEnum google__protobuf__FeatureSet__JsonFormat_enum_init = { 64, 0, { @@ -1222,7 +1222,7 @@ const upb_MiniTableEnum google_protobuf_FeatureSet_JsonFormat_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_FeatureSet_MessageEncoding_enum_init = { +const upb_MiniTableEnum google__protobuf__FeatureSet__MessageEncoding_enum_init = { 64, 0, { @@ -1231,7 +1231,7 @@ const upb_MiniTableEnum google_protobuf_FeatureSet_MessageEncoding_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init = { +const upb_MiniTableEnum google__protobuf__FeatureSet__RepeatedFieldEncoding_enum_init = { 64, 0, { @@ -1240,7 +1240,7 @@ const upb_MiniTableEnum google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_in }, }; -const upb_MiniTableEnum google_protobuf_FeatureSet_Utf8Validation_enum_init = { +const upb_MiniTableEnum google__protobuf__FeatureSet__Utf8Validation_enum_init = { 64, 0, { @@ -1249,7 +1249,7 @@ const upb_MiniTableEnum google_protobuf_FeatureSet_Utf8Validation_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Label_enum_init = { +const upb_MiniTableEnum google__protobuf__FieldDescriptorProto__Label_enum_init = { 64, 0, { @@ -1258,7 +1258,7 @@ const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Label_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Type_enum_init = { +const upb_MiniTableEnum google__protobuf__FieldDescriptorProto__Type_enum_init = { 64, 0, { @@ -1267,7 +1267,7 @@ const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Type_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_FieldOptions_CType_enum_init = { +const upb_MiniTableEnum google__protobuf__FieldOptions__CType_enum_init = { 64, 0, { @@ -1276,7 +1276,7 @@ const upb_MiniTableEnum google_protobuf_FieldOptions_CType_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_FieldOptions_JSType_enum_init = { +const upb_MiniTableEnum google__protobuf__FieldOptions__JSType_enum_init = { 64, 0, { @@ -1285,7 +1285,7 @@ const upb_MiniTableEnum google_protobuf_FieldOptions_JSType_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_FieldOptions_OptionRetention_enum_init = { +const upb_MiniTableEnum google__protobuf__FieldOptions__OptionRetention_enum_init = { 64, 0, { @@ -1294,7 +1294,7 @@ const upb_MiniTableEnum google_protobuf_FieldOptions_OptionRetention_enum_init = }, }; -const upb_MiniTableEnum google_protobuf_FieldOptions_OptionTargetType_enum_init = { +const upb_MiniTableEnum google__protobuf__FieldOptions__OptionTargetType_enum_init = { 64, 0, { @@ -1303,7 +1303,7 @@ const upb_MiniTableEnum google_protobuf_FieldOptions_OptionTargetType_enum_init }, }; -const upb_MiniTableEnum google_protobuf_FileOptions_OptimizeMode_enum_init = { +const upb_MiniTableEnum google__protobuf__FileOptions__OptimizeMode_enum_init = { 64, 0, { @@ -1312,7 +1312,7 @@ const upb_MiniTableEnum google_protobuf_FileOptions_OptimizeMode_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init = { +const upb_MiniTableEnum google__protobuf__GeneratedCodeInfo__Annotation__Semantic_enum_init = { 64, 0, { @@ -1321,7 +1321,7 @@ const upb_MiniTableEnum google_protobuf_GeneratedCodeInfo_Annotation_Semantic_en }, }; -const upb_MiniTableEnum google_protobuf_MethodOptions_IdempotencyLevel_enum_init = { +const upb_MiniTableEnum google__protobuf__MethodOptions__IdempotencyLevel_enum_init = { 64, 0, { @@ -1367,23 +1367,23 @@ static const upb_MiniTable *messages_layout[33] = { }; static const upb_MiniTableEnum *enums_layout[17] = { - &google_protobuf_Edition_enum_init, - &google_protobuf_ExtensionRangeOptions_VerificationState_enum_init, - &google_protobuf_FeatureSet_EnumType_enum_init, - &google_protobuf_FeatureSet_FieldPresence_enum_init, - &google_protobuf_FeatureSet_JsonFormat_enum_init, - &google_protobuf_FeatureSet_MessageEncoding_enum_init, - &google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init, - &google_protobuf_FeatureSet_Utf8Validation_enum_init, - &google_protobuf_FieldDescriptorProto_Label_enum_init, - &google_protobuf_FieldDescriptorProto_Type_enum_init, - &google_protobuf_FieldOptions_CType_enum_init, - &google_protobuf_FieldOptions_JSType_enum_init, - &google_protobuf_FieldOptions_OptionRetention_enum_init, - &google_protobuf_FieldOptions_OptionTargetType_enum_init, - &google_protobuf_FileOptions_OptimizeMode_enum_init, - &google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init, - &google_protobuf_MethodOptions_IdempotencyLevel_enum_init, + &google__protobuf__Edition_enum_init, + &google__protobuf__ExtensionRangeOptions__VerificationState_enum_init, + &google__protobuf__FeatureSet__EnumType_enum_init, + &google__protobuf__FeatureSet__FieldPresence_enum_init, + &google__protobuf__FeatureSet__JsonFormat_enum_init, + &google__protobuf__FeatureSet__MessageEncoding_enum_init, + &google__protobuf__FeatureSet__RepeatedFieldEncoding_enum_init, + &google__protobuf__FeatureSet__Utf8Validation_enum_init, + &google__protobuf__FieldDescriptorProto__Label_enum_init, + &google__protobuf__FieldDescriptorProto__Type_enum_init, + &google__protobuf__FieldOptions__CType_enum_init, + &google__protobuf__FieldOptions__JSType_enum_init, + &google__protobuf__FieldOptions__OptionRetention_enum_init, + &google__protobuf__FieldOptions__OptionTargetType_enum_init, + &google__protobuf__FileOptions__OptimizeMode_enum_init, + &google__protobuf__GeneratedCodeInfo__Annotation__Semantic_enum_init, + &google__protobuf__MethodOptions__IdempotencyLevel_enum_init, }; const upb_MiniTableFile google_protobuf_descriptor_proto_upb_file_layout = { diff --git a/upb/cmake/google/protobuf/descriptor.upb_minitable.h b/upb/cmake/google/protobuf/descriptor.upb_minitable.h index 6cb83ecedc..1dea594faf 100644 --- a/upb/cmake/google/protobuf/descriptor.upb_minitable.h +++ b/upb/cmake/google/protobuf/descriptor.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_MINITABLE_H_ -#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_MINITABLE_H_ +#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_MINITABLE_H_ +#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -85,23 +85,23 @@ extern const upb_MiniTable* google__protobuf__GeneratedCodeInfo_msg_init_ptr; extern const upb_MiniTable google__protobuf__GeneratedCodeInfo__Annotation_msg_init; extern const upb_MiniTable* google__protobuf__GeneratedCodeInfo__Annotation_msg_init_ptr; -extern const upb_MiniTableEnum google_protobuf_Edition_enum_init; -extern const upb_MiniTableEnum google_protobuf_ExtensionRangeOptions_VerificationState_enum_init; -extern const upb_MiniTableEnum google_protobuf_FeatureSet_EnumType_enum_init; -extern const upb_MiniTableEnum google_protobuf_FeatureSet_FieldPresence_enum_init; -extern const upb_MiniTableEnum google_protobuf_FeatureSet_JsonFormat_enum_init; -extern const upb_MiniTableEnum google_protobuf_FeatureSet_MessageEncoding_enum_init; -extern const upb_MiniTableEnum google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init; -extern const upb_MiniTableEnum google_protobuf_FeatureSet_Utf8Validation_enum_init; -extern const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Label_enum_init; -extern const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Type_enum_init; -extern const upb_MiniTableEnum google_protobuf_FieldOptions_CType_enum_init; -extern const upb_MiniTableEnum google_protobuf_FieldOptions_JSType_enum_init; -extern const upb_MiniTableEnum google_protobuf_FieldOptions_OptionRetention_enum_init; -extern const upb_MiniTableEnum google_protobuf_FieldOptions_OptionTargetType_enum_init; -extern const upb_MiniTableEnum google_protobuf_FileOptions_OptimizeMode_enum_init; -extern const upb_MiniTableEnum google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init; -extern const upb_MiniTableEnum google_protobuf_MethodOptions_IdempotencyLevel_enum_init; +extern const upb_MiniTableEnum google__protobuf__Edition_enum_init; +extern const upb_MiniTableEnum google__protobuf__ExtensionRangeOptions__VerificationState_enum_init; +extern const upb_MiniTableEnum google__protobuf__FeatureSet__EnumType_enum_init; +extern const upb_MiniTableEnum google__protobuf__FeatureSet__FieldPresence_enum_init; +extern const upb_MiniTableEnum google__protobuf__FeatureSet__JsonFormat_enum_init; +extern const upb_MiniTableEnum google__protobuf__FeatureSet__MessageEncoding_enum_init; +extern const upb_MiniTableEnum google__protobuf__FeatureSet__RepeatedFieldEncoding_enum_init; +extern const upb_MiniTableEnum google__protobuf__FeatureSet__Utf8Validation_enum_init; +extern const upb_MiniTableEnum google__protobuf__FieldDescriptorProto__Label_enum_init; +extern const upb_MiniTableEnum google__protobuf__FieldDescriptorProto__Type_enum_init; +extern const upb_MiniTableEnum google__protobuf__FieldOptions__CType_enum_init; +extern const upb_MiniTableEnum google__protobuf__FieldOptions__JSType_enum_init; +extern const upb_MiniTableEnum google__protobuf__FieldOptions__OptionRetention_enum_init; +extern const upb_MiniTableEnum google__protobuf__FieldOptions__OptionTargetType_enum_init; +extern const upb_MiniTableEnum google__protobuf__FileOptions__OptimizeMode_enum_init; +extern const upb_MiniTableEnum google__protobuf__GeneratedCodeInfo__Annotation__Semantic_enum_init; +extern const upb_MiniTableEnum google__protobuf__MethodOptions__IdempotencyLevel_enum_init; extern const upb_MiniTableFile google_protobuf_descriptor_proto_upb_file_layout; #ifdef __cplusplus @@ -110,4 +110,4 @@ extern const upb_MiniTableFile google_protobuf_descriptor_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_MINITABLE_H_ */ +#endif /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_MINITABLE_H_ */ diff --git a/upb/reflection/cmake/google/protobuf/descriptor.upb.h b/upb/reflection/cmake/google/protobuf/descriptor.upb.h index c0b8c61910..736f42fe5a 100644 --- a/upb/reflection/cmake/google/protobuf/descriptor.upb.h +++ b/upb/reflection/cmake/google/protobuf/descriptor.upb.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_ -#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_ +#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_H_ +#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -6894,4 +6894,4 @@ UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_semantic(google #include "upb/port/undef.inc" -#endif /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_ */ +#endif /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_H_ */ diff --git a/upb/reflection/cmake/google/protobuf/descriptor.upb_minitable.c b/upb/reflection/cmake/google/protobuf/descriptor.upb_minitable.c index 08fa451f75..b08864e929 100644 --- a/upb/reflection/cmake/google/protobuf/descriptor.upb_minitable.c +++ b/upb/reflection/cmake/google/protobuf/descriptor.upb_minitable.c @@ -14,7 +14,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal google_protobuf_FileDescriptorSet_submsgs[1] = { +static const upb_MiniTableSubInternal google_protobuf_FileDescriptorSet__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FileDescriptorProto_msg_init_ptr}, }; @@ -23,7 +23,7 @@ static const upb_MiniTableField google_protobuf_FileDescriptorSet__fields[1] = { }; const upb_MiniTable google__protobuf__FileDescriptorSet_msg_init = { - &google_protobuf_FileDescriptorSet_submsgs[0], + &google_protobuf_FileDescriptorSet__submsgs[0], &google_protobuf_FileDescriptorSet__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, #ifdef UPB_TRACING_ENABLED @@ -36,14 +36,14 @@ const upb_MiniTable google__protobuf__FileDescriptorSet_msg_init = { }; const upb_MiniTable* google__protobuf__FileDescriptorSet_msg_init_ptr = &google__protobuf__FileDescriptorSet_msg_init; -static const upb_MiniTableSubInternal google_protobuf_FileDescriptorProto_submsgs[7] = { +static const upb_MiniTableSubInternal google_protobuf_FileDescriptorProto__submsgs[7] = { {.UPB_PRIVATE(submsg) = &google__protobuf__DescriptorProto_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__EnumDescriptorProto_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__ServiceDescriptorProto_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__FieldDescriptorProto_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__FileOptions_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__SourceCodeInfo_msg_init_ptr}, - {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init}, }; static const upb_MiniTableField google_protobuf_FileDescriptorProto__fields[13] = { @@ -63,7 +63,7 @@ static const upb_MiniTableField google_protobuf_FileDescriptorProto__fields[13] }; const upb_MiniTable google__protobuf__FileDescriptorProto_msg_init = { - &google_protobuf_FileDescriptorProto_submsgs[0], + &google_protobuf_FileDescriptorProto__submsgs[0], &google_protobuf_FileDescriptorProto__fields[0], UPB_SIZE(80, 136), 13, kUpb_ExtMode_NonExtendable, 12, UPB_FASTTABLE_MASK(120), 0, #ifdef UPB_TRACING_ENABLED @@ -90,7 +90,7 @@ const upb_MiniTable google__protobuf__FileDescriptorProto_msg_init = { }; const upb_MiniTable* google__protobuf__FileDescriptorProto_msg_init_ptr = &google__protobuf__FileDescriptorProto_msg_init; -static const upb_MiniTableSubInternal google_protobuf_DescriptorProto_submsgs[8] = { +static const upb_MiniTableSubInternal google_protobuf_DescriptorProto__submsgs[8] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FieldDescriptorProto_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__DescriptorProto_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__EnumDescriptorProto_msg_init_ptr}, @@ -115,7 +115,7 @@ static const upb_MiniTableField google_protobuf_DescriptorProto__fields[10] = { }; const upb_MiniTable google__protobuf__DescriptorProto_msg_init = { - &google_protobuf_DescriptorProto_submsgs[0], + &google_protobuf_DescriptorProto__submsgs[0], &google_protobuf_DescriptorProto__fields[0], UPB_SIZE(56, 104), 10, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(120), 0, #ifdef UPB_TRACING_ENABLED @@ -142,7 +142,7 @@ const upb_MiniTable google__protobuf__DescriptorProto_msg_init = { }; const upb_MiniTable* google__protobuf__DescriptorProto_msg_init_ptr = &google__protobuf__DescriptorProto_msg_init; -static const upb_MiniTableSubInternal google_protobuf_DescriptorProto_ExtensionRange_submsgs[1] = { +static const upb_MiniTableSubInternal google_protobuf_DescriptorProto_ExtensionRange__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__ExtensionRangeOptions_msg_init_ptr}, }; @@ -153,7 +153,7 @@ static const upb_MiniTableField google_protobuf_DescriptorProto_ExtensionRange__ }; const upb_MiniTable google__protobuf__DescriptorProto__ExtensionRange_msg_init = { - &google_protobuf_DescriptorProto_ExtensionRange_submsgs[0], + &google_protobuf_DescriptorProto_ExtensionRange__submsgs[0], &google_protobuf_DescriptorProto_ExtensionRange__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(255), 0, #ifdef UPB_TRACING_ENABLED @@ -177,11 +177,11 @@ const upb_MiniTable google__protobuf__DescriptorProto__ReservedRange_msg_init = }; const upb_MiniTable* google__protobuf__DescriptorProto__ReservedRange_msg_init_ptr = &google__protobuf__DescriptorProto__ReservedRange_msg_init; -static const upb_MiniTableSubInternal google_protobuf_ExtensionRangeOptions_submsgs[4] = { +static const upb_MiniTableSubInternal google_protobuf_ExtensionRangeOptions__submsgs[4] = { {.UPB_PRIVATE(submsg) = &google__protobuf__ExtensionRangeOptions__Declaration_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, - {.UPB_PRIVATE(subenum) = &google_protobuf_ExtensionRangeOptions_VerificationState_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__ExtensionRangeOptions__VerificationState_enum_init}, }; static const upb_MiniTableField google_protobuf_ExtensionRangeOptions__fields[4] = { @@ -192,7 +192,7 @@ static const upb_MiniTableField google_protobuf_ExtensionRangeOptions__fields[4] }; const upb_MiniTable google__protobuf__ExtensionRangeOptions_msg_init = { - &google_protobuf_ExtensionRangeOptions_submsgs[0], + &google_protobuf_ExtensionRangeOptions__submsgs[0], &google_protobuf_ExtensionRangeOptions__fields[0], UPB_SIZE(32, 40), 4, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0, #ifdef UPB_TRACING_ENABLED @@ -253,10 +253,10 @@ const upb_MiniTable google__protobuf__ExtensionRangeOptions__Declaration_msg_ini }; const upb_MiniTable* google__protobuf__ExtensionRangeOptions__Declaration_msg_init_ptr = &google__protobuf__ExtensionRangeOptions__Declaration_msg_init; -static const upb_MiniTableSubInternal google_protobuf_FieldDescriptorProto_submsgs[3] = { +static const upb_MiniTableSubInternal google_protobuf_FieldDescriptorProto__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions_msg_init_ptr}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FieldDescriptorProto_Label_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FieldDescriptorProto_Type_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FieldDescriptorProto__Label_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FieldDescriptorProto__Type_enum_init}, }; static const upb_MiniTableField google_protobuf_FieldDescriptorProto__fields[11] = { @@ -274,7 +274,7 @@ static const upb_MiniTableField google_protobuf_FieldDescriptorProto__fields[11] }; const upb_MiniTable google__protobuf__FieldDescriptorProto_msg_init = { - &google_protobuf_FieldDescriptorProto_submsgs[0], + &google_protobuf_FieldDescriptorProto__submsgs[0], &google_protobuf_FieldDescriptorProto__fields[0], UPB_SIZE(80, 120), 11, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(255), 0, #ifdef UPB_TRACING_ENABLED @@ -283,7 +283,7 @@ const upb_MiniTable google__protobuf__FieldDescriptorProto_msg_init = { }; const upb_MiniTable* google__protobuf__FieldDescriptorProto_msg_init_ptr = &google__protobuf__FieldDescriptorProto_msg_init; -static const upb_MiniTableSubInternal google_protobuf_OneofDescriptorProto_submsgs[1] = { +static const upb_MiniTableSubInternal google_protobuf_OneofDescriptorProto__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__OneofOptions_msg_init_ptr}, }; @@ -293,7 +293,7 @@ static const upb_MiniTableField google_protobuf_OneofDescriptorProto__fields[2] }; const upb_MiniTable google__protobuf__OneofDescriptorProto_msg_init = { - &google_protobuf_OneofDescriptorProto_submsgs[0], + &google_protobuf_OneofDescriptorProto__submsgs[0], &google_protobuf_OneofDescriptorProto__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, #ifdef UPB_TRACING_ENABLED @@ -302,7 +302,7 @@ const upb_MiniTable google__protobuf__OneofDescriptorProto_msg_init = { }; const upb_MiniTable* google__protobuf__OneofDescriptorProto_msg_init_ptr = &google__protobuf__OneofDescriptorProto_msg_init; -static const upb_MiniTableSubInternal google_protobuf_EnumDescriptorProto_submsgs[3] = { +static const upb_MiniTableSubInternal google_protobuf_EnumDescriptorProto__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__EnumValueDescriptorProto_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__EnumOptions_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init_ptr}, @@ -317,7 +317,7 @@ static const upb_MiniTableField google_protobuf_EnumDescriptorProto__fields[5] = }; const upb_MiniTable google__protobuf__EnumDescriptorProto_msg_init = { - &google_protobuf_EnumDescriptorProto_submsgs[0], + &google_protobuf_EnumDescriptorProto__submsgs[0], &google_protobuf_EnumDescriptorProto__fields[0], UPB_SIZE(40, 64), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, #ifdef UPB_TRACING_ENABLED @@ -351,7 +351,7 @@ const upb_MiniTable google__protobuf__EnumDescriptorProto__EnumReservedRange_msg }; const upb_MiniTable* google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init_ptr = &google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init; -static const upb_MiniTableSubInternal google_protobuf_EnumValueDescriptorProto_submsgs[1] = { +static const upb_MiniTableSubInternal google_protobuf_EnumValueDescriptorProto__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__EnumValueOptions_msg_init_ptr}, }; @@ -362,7 +362,7 @@ static const upb_MiniTableField google_protobuf_EnumValueDescriptorProto__fields }; const upb_MiniTable google__protobuf__EnumValueDescriptorProto_msg_init = { - &google_protobuf_EnumValueDescriptorProto_submsgs[0], + &google_protobuf_EnumValueDescriptorProto__submsgs[0], &google_protobuf_EnumValueDescriptorProto__fields[0], UPB_SIZE(32, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(255), 0, #ifdef UPB_TRACING_ENABLED @@ -371,7 +371,7 @@ const upb_MiniTable google__protobuf__EnumValueDescriptorProto_msg_init = { }; const upb_MiniTable* google__protobuf__EnumValueDescriptorProto_msg_init_ptr = &google__protobuf__EnumValueDescriptorProto_msg_init; -static const upb_MiniTableSubInternal google_protobuf_ServiceDescriptorProto_submsgs[2] = { +static const upb_MiniTableSubInternal google_protobuf_ServiceDescriptorProto__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__MethodDescriptorProto_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__ServiceOptions_msg_init_ptr}, }; @@ -383,7 +383,7 @@ static const upb_MiniTableField google_protobuf_ServiceDescriptorProto__fields[3 }; const upb_MiniTable google__protobuf__ServiceDescriptorProto_msg_init = { - &google_protobuf_ServiceDescriptorProto_submsgs[0], + &google_protobuf_ServiceDescriptorProto__submsgs[0], &google_protobuf_ServiceDescriptorProto__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, #ifdef UPB_TRACING_ENABLED @@ -398,7 +398,7 @@ const upb_MiniTable google__protobuf__ServiceDescriptorProto_msg_init = { }; const upb_MiniTable* google__protobuf__ServiceDescriptorProto_msg_init_ptr = &google__protobuf__ServiceDescriptorProto_msg_init; -static const upb_MiniTableSubInternal google_protobuf_MethodDescriptorProto_submsgs[1] = { +static const upb_MiniTableSubInternal google_protobuf_MethodDescriptorProto__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__MethodOptions_msg_init_ptr}, }; @@ -412,7 +412,7 @@ static const upb_MiniTableField google_protobuf_MethodDescriptorProto__fields[6] }; const upb_MiniTable google__protobuf__MethodDescriptorProto_msg_init = { - &google_protobuf_MethodDescriptorProto_submsgs[0], + &google_protobuf_MethodDescriptorProto__submsgs[0], &google_protobuf_MethodDescriptorProto__fields[0], UPB_SIZE(48, 72), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(255), 0, #ifdef UPB_TRACING_ENABLED @@ -421,10 +421,10 @@ const upb_MiniTable google__protobuf__MethodDescriptorProto_msg_init = { }; const upb_MiniTable* google__protobuf__MethodDescriptorProto_msg_init_ptr = &google__protobuf__MethodDescriptorProto_msg_init; -static const upb_MiniTableSubInternal google_protobuf_FileOptions_submsgs[3] = { +static const upb_MiniTableSubInternal google_protobuf_FileOptions__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FileOptions_OptimizeMode_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FileOptions__OptimizeMode_enum_init}, }; static const upb_MiniTableField google_protobuf_FileOptions__fields[21] = { @@ -452,7 +452,7 @@ static const upb_MiniTableField google_protobuf_FileOptions__fields[21] = { }; const upb_MiniTable google__protobuf__FileOptions_msg_init = { - &google_protobuf_FileOptions_submsgs[0], + &google_protobuf_FileOptions__submsgs[0], &google_protobuf_FileOptions__fields[0], UPB_SIZE(112, 200), 21, kUpb_ExtMode_Extendable, 1, UPB_FASTTABLE_MASK(248), 0, #ifdef UPB_TRACING_ENABLED @@ -495,7 +495,7 @@ const upb_MiniTable google__protobuf__FileOptions_msg_init = { }; const upb_MiniTable* google__protobuf__FileOptions_msg_init_ptr = &google__protobuf__FileOptions_msg_init; -static const upb_MiniTableSubInternal google_protobuf_MessageOptions_submsgs[2] = { +static const upb_MiniTableSubInternal google_protobuf_MessageOptions__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, }; @@ -511,7 +511,7 @@ static const upb_MiniTableField google_protobuf_MessageOptions__fields[7] = { }; const upb_MiniTable google__protobuf__MessageOptions_msg_init = { - &google_protobuf_MessageOptions_submsgs[0], + &google_protobuf_MessageOptions__submsgs[0], &google_protobuf_MessageOptions__fields[0], UPB_SIZE(24, 32), 7, kUpb_ExtMode_Extendable, 3, UPB_FASTTABLE_MASK(248), 0, #ifdef UPB_TRACING_ENABLED @@ -554,15 +554,15 @@ const upb_MiniTable google__protobuf__MessageOptions_msg_init = { }; const upb_MiniTable* google__protobuf__MessageOptions_msg_init_ptr = &google__protobuf__MessageOptions_msg_init; -static const upb_MiniTableSubInternal google_protobuf_FieldOptions_submsgs[8] = { +static const upb_MiniTableSubInternal google_protobuf_FieldOptions__submsgs[8] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions__EditionDefault_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions__FeatureSupport_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FieldOptions_CType_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FieldOptions_JSType_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FieldOptions_OptionRetention_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FieldOptions_OptionTargetType_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FieldOptions__CType_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FieldOptions__JSType_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FieldOptions__OptionRetention_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FieldOptions__OptionTargetType_enum_init}, }; static const upb_MiniTableField google_protobuf_FieldOptions__fields[14] = { @@ -583,7 +583,7 @@ static const upb_MiniTableField google_protobuf_FieldOptions__fields[14] = { }; const upb_MiniTable google__protobuf__FieldOptions_msg_init = { - &google_protobuf_FieldOptions_submsgs[0], + &google_protobuf_FieldOptions__submsgs[0], &google_protobuf_FieldOptions__fields[0], UPB_SIZE(56, 72), 14, kUpb_ExtMode_Extendable, 3, UPB_FASTTABLE_MASK(248), 0, #ifdef UPB_TRACING_ENABLED @@ -626,8 +626,8 @@ const upb_MiniTable google__protobuf__FieldOptions_msg_init = { }; const upb_MiniTable* google__protobuf__FieldOptions_msg_init_ptr = &google__protobuf__FieldOptions_msg_init; -static const upb_MiniTableSubInternal google_protobuf_FieldOptions_EditionDefault_submsgs[1] = { - {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, +static const upb_MiniTableSubInternal google_protobuf_FieldOptions_EditionDefault__submsgs[1] = { + {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init}, }; static const upb_MiniTableField google_protobuf_FieldOptions_EditionDefault__fields[2] = { @@ -636,7 +636,7 @@ static const upb_MiniTableField google_protobuf_FieldOptions_EditionDefault__fie }; const upb_MiniTable google__protobuf__FieldOptions__EditionDefault_msg_init = { - &google_protobuf_FieldOptions_EditionDefault_submsgs[0], + &google_protobuf_FieldOptions_EditionDefault__submsgs[0], &google_protobuf_FieldOptions_EditionDefault__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, #ifdef UPB_TRACING_ENABLED @@ -645,10 +645,10 @@ const upb_MiniTable google__protobuf__FieldOptions__EditionDefault_msg_init = { }; const upb_MiniTable* google__protobuf__FieldOptions__EditionDefault_msg_init_ptr = &google__protobuf__FieldOptions__EditionDefault_msg_init; -static const upb_MiniTableSubInternal google_protobuf_FieldOptions_FeatureSupport_submsgs[3] = { - {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, +static const upb_MiniTableSubInternal google_protobuf_FieldOptions_FeatureSupport__submsgs[3] = { + {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init}, }; static const upb_MiniTableField google_protobuf_FieldOptions_FeatureSupport__fields[4] = { @@ -659,7 +659,7 @@ static const upb_MiniTableField google_protobuf_FieldOptions_FeatureSupport__fie }; const upb_MiniTable google__protobuf__FieldOptions__FeatureSupport_msg_init = { - &google_protobuf_FieldOptions_FeatureSupport_submsgs[0], + &google_protobuf_FieldOptions_FeatureSupport__submsgs[0], &google_protobuf_FieldOptions_FeatureSupport__fields[0], UPB_SIZE(32, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(255), 0, #ifdef UPB_TRACING_ENABLED @@ -668,7 +668,7 @@ const upb_MiniTable google__protobuf__FieldOptions__FeatureSupport_msg_init = { }; const upb_MiniTable* google__protobuf__FieldOptions__FeatureSupport_msg_init_ptr = &google__protobuf__FieldOptions__FeatureSupport_msg_init; -static const upb_MiniTableSubInternal google_protobuf_OneofOptions_submsgs[2] = { +static const upb_MiniTableSubInternal google_protobuf_OneofOptions__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, }; @@ -679,7 +679,7 @@ static const upb_MiniTableField google_protobuf_OneofOptions__fields[2] = { }; const upb_MiniTable google__protobuf__OneofOptions_msg_init = { - &google_protobuf_OneofOptions_submsgs[0], + &google_protobuf_OneofOptions__submsgs[0], &google_protobuf_OneofOptions__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_Extendable, 1, UPB_FASTTABLE_MASK(248), 0, #ifdef UPB_TRACING_ENABLED @@ -722,7 +722,7 @@ const upb_MiniTable google__protobuf__OneofOptions_msg_init = { }; const upb_MiniTable* google__protobuf__OneofOptions_msg_init_ptr = &google__protobuf__OneofOptions_msg_init; -static const upb_MiniTableSubInternal google_protobuf_EnumOptions_submsgs[2] = { +static const upb_MiniTableSubInternal google_protobuf_EnumOptions__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, }; @@ -736,7 +736,7 @@ static const upb_MiniTableField google_protobuf_EnumOptions__fields[5] = { }; const upb_MiniTable google__protobuf__EnumOptions_msg_init = { - &google_protobuf_EnumOptions_submsgs[0], + &google_protobuf_EnumOptions__submsgs[0], &google_protobuf_EnumOptions__fields[0], UPB_SIZE(24, 32), 5, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0, #ifdef UPB_TRACING_ENABLED @@ -779,7 +779,7 @@ const upb_MiniTable google__protobuf__EnumOptions_msg_init = { }; const upb_MiniTable* google__protobuf__EnumOptions_msg_init_ptr = &google__protobuf__EnumOptions_msg_init; -static const upb_MiniTableSubInternal google_protobuf_EnumValueOptions_submsgs[3] = { +static const upb_MiniTableSubInternal google_protobuf_EnumValueOptions__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions__FeatureSupport_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, @@ -794,7 +794,7 @@ static const upb_MiniTableField google_protobuf_EnumValueOptions__fields[5] = { }; const upb_MiniTable google__protobuf__EnumValueOptions_msg_init = { - &google_protobuf_EnumValueOptions_submsgs[0], + &google_protobuf_EnumValueOptions__submsgs[0], &google_protobuf_EnumValueOptions__fields[0], UPB_SIZE(32, 40), 5, kUpb_ExtMode_Extendable, 4, UPB_FASTTABLE_MASK(248), 0, #ifdef UPB_TRACING_ENABLED @@ -837,7 +837,7 @@ const upb_MiniTable google__protobuf__EnumValueOptions_msg_init = { }; const upb_MiniTable* google__protobuf__EnumValueOptions_msg_init_ptr = &google__protobuf__EnumValueOptions_msg_init; -static const upb_MiniTableSubInternal google_protobuf_ServiceOptions_submsgs[2] = { +static const upb_MiniTableSubInternal google_protobuf_ServiceOptions__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, }; @@ -849,7 +849,7 @@ static const upb_MiniTableField google_protobuf_ServiceOptions__fields[3] = { }; const upb_MiniTable google__protobuf__ServiceOptions_msg_init = { - &google_protobuf_ServiceOptions_submsgs[0], + &google_protobuf_ServiceOptions__submsgs[0], &google_protobuf_ServiceOptions__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0, #ifdef UPB_TRACING_ENABLED @@ -892,10 +892,10 @@ const upb_MiniTable google__protobuf__ServiceOptions_msg_init = { }; const upb_MiniTable* google__protobuf__ServiceOptions_msg_init_ptr = &google__protobuf__ServiceOptions_msg_init; -static const upb_MiniTableSubInternal google_protobuf_MethodOptions_submsgs[3] = { +static const upb_MiniTableSubInternal google_protobuf_MethodOptions__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, - {.UPB_PRIVATE(subenum) = &google_protobuf_MethodOptions_IdempotencyLevel_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__MethodOptions__IdempotencyLevel_enum_init}, }; static const upb_MiniTableField google_protobuf_MethodOptions__fields[4] = { @@ -906,7 +906,7 @@ static const upb_MiniTableField google_protobuf_MethodOptions__fields[4] = { }; const upb_MiniTable google__protobuf__MethodOptions_msg_init = { - &google_protobuf_MethodOptions_submsgs[0], + &google_protobuf_MethodOptions__submsgs[0], &google_protobuf_MethodOptions__fields[0], UPB_SIZE(24, 32), 4, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0, #ifdef UPB_TRACING_ENABLED @@ -949,7 +949,7 @@ const upb_MiniTable google__protobuf__MethodOptions_msg_init = { }; const upb_MiniTable* google__protobuf__MethodOptions_msg_init_ptr = &google__protobuf__MethodOptions_msg_init; -static const upb_MiniTableSubInternal google_protobuf_UninterpretedOption_submsgs[1] = { +static const upb_MiniTableSubInternal google_protobuf_UninterpretedOption__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption__NamePart_msg_init_ptr}, }; @@ -964,7 +964,7 @@ static const upb_MiniTableField google_protobuf_UninterpretedOption__fields[7] = }; const upb_MiniTable google__protobuf__UninterpretedOption_msg_init = { - &google_protobuf_UninterpretedOption_submsgs[0], + &google_protobuf_UninterpretedOption__submsgs[0], &google_protobuf_UninterpretedOption__fields[0], UPB_SIZE(64, 96), 7, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0, #ifdef UPB_TRACING_ENABLED @@ -994,13 +994,13 @@ const upb_MiniTable google__protobuf__UninterpretedOption__NamePart_msg_init = { }; const upb_MiniTable* google__protobuf__UninterpretedOption__NamePart_msg_init_ptr = &google__protobuf__UninterpretedOption__NamePart_msg_init; -static const upb_MiniTableSubInternal google_protobuf_FeatureSet_submsgs[6] = { - {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_FieldPresence_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_EnumType_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_Utf8Validation_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_MessageEncoding_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_JsonFormat_enum_init}, +static const upb_MiniTableSubInternal google_protobuf_FeatureSet__submsgs[6] = { + {.UPB_PRIVATE(subenum) = &google__protobuf__FeatureSet__FieldPresence_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FeatureSet__EnumType_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FeatureSet__RepeatedFieldEncoding_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FeatureSet__Utf8Validation_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FeatureSet__MessageEncoding_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FeatureSet__JsonFormat_enum_init}, }; static const upb_MiniTableField google_protobuf_FeatureSet__fields[6] = { @@ -1013,7 +1013,7 @@ static const upb_MiniTableField google_protobuf_FeatureSet__fields[6] = { }; const upb_MiniTable google__protobuf__FeatureSet_msg_init = { - &google_protobuf_FeatureSet_submsgs[0], + &google_protobuf_FeatureSet__submsgs[0], &google_protobuf_FeatureSet__fields[0], 40, 6, kUpb_ExtMode_Extendable, 6, UPB_FASTTABLE_MASK(255), 0, #ifdef UPB_TRACING_ENABLED @@ -1022,10 +1022,10 @@ const upb_MiniTable google__protobuf__FeatureSet_msg_init = { }; const upb_MiniTable* google__protobuf__FeatureSet_msg_init_ptr = &google__protobuf__FeatureSet_msg_init; -static const upb_MiniTableSubInternal google_protobuf_FeatureSetDefaults_submsgs[3] = { +static const upb_MiniTableSubInternal google_protobuf_FeatureSetDefaults__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init_ptr}, - {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init}, }; static const upb_MiniTableField google_protobuf_FeatureSetDefaults__fields[3] = { @@ -1035,7 +1035,7 @@ static const upb_MiniTableField google_protobuf_FeatureSetDefaults__fields[3] = }; const upb_MiniTable google__protobuf__FeatureSetDefaults_msg_init = { - &google_protobuf_FeatureSetDefaults_submsgs[0], + &google_protobuf_FeatureSetDefaults__submsgs[0], &google_protobuf_FeatureSetDefaults__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, #ifdef UPB_TRACING_ENABLED @@ -1048,10 +1048,10 @@ const upb_MiniTable google__protobuf__FeatureSetDefaults_msg_init = { }; const upb_MiniTable* google__protobuf__FeatureSetDefaults_msg_init_ptr = &google__protobuf__FeatureSetDefaults_msg_init; -static const upb_MiniTableSubInternal google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_submsgs[3] = { +static const upb_MiniTableSubInternal google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, - {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init}, }; static const upb_MiniTableField google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault__fields[3] = { @@ -1061,7 +1061,7 @@ static const upb_MiniTableField google_protobuf_FeatureSetDefaults_FeatureSetEdi }; const upb_MiniTable google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init = { - &google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_submsgs[0], + &google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault__submsgs[0], &google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, #ifdef UPB_TRACING_ENABLED @@ -1070,7 +1070,7 @@ const upb_MiniTable google__protobuf__FeatureSetDefaults__FeatureSetEditionDefau }; const upb_MiniTable* google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init_ptr = &google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init; -static const upb_MiniTableSubInternal google_protobuf_SourceCodeInfo_submsgs[1] = { +static const upb_MiniTableSubInternal google_protobuf_SourceCodeInfo__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__SourceCodeInfo__Location_msg_init_ptr}, }; @@ -1079,7 +1079,7 @@ static const upb_MiniTableField google_protobuf_SourceCodeInfo__fields[1] = { }; const upb_MiniTable google__protobuf__SourceCodeInfo_msg_init = { - &google_protobuf_SourceCodeInfo_submsgs[0], + &google_protobuf_SourceCodeInfo__submsgs[0], &google_protobuf_SourceCodeInfo__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, #ifdef UPB_TRACING_ENABLED @@ -1120,7 +1120,7 @@ const upb_MiniTable google__protobuf__SourceCodeInfo__Location_msg_init = { }; const upb_MiniTable* google__protobuf__SourceCodeInfo__Location_msg_init_ptr = &google__protobuf__SourceCodeInfo__Location_msg_init; -static const upb_MiniTableSubInternal google_protobuf_GeneratedCodeInfo_submsgs[1] = { +static const upb_MiniTableSubInternal google_protobuf_GeneratedCodeInfo__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__GeneratedCodeInfo__Annotation_msg_init_ptr}, }; @@ -1129,7 +1129,7 @@ static const upb_MiniTableField google_protobuf_GeneratedCodeInfo__fields[1] = { }; const upb_MiniTable google__protobuf__GeneratedCodeInfo_msg_init = { - &google_protobuf_GeneratedCodeInfo_submsgs[0], + &google_protobuf_GeneratedCodeInfo__submsgs[0], &google_protobuf_GeneratedCodeInfo__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, #ifdef UPB_TRACING_ENABLED @@ -1142,8 +1142,8 @@ const upb_MiniTable google__protobuf__GeneratedCodeInfo_msg_init = { }; const upb_MiniTable* google__protobuf__GeneratedCodeInfo_msg_init_ptr = &google__protobuf__GeneratedCodeInfo_msg_init; -static const upb_MiniTableSubInternal google_protobuf_GeneratedCodeInfo_Annotation_submsgs[1] = { - {.UPB_PRIVATE(subenum) = &google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init}, +static const upb_MiniTableSubInternal google_protobuf_GeneratedCodeInfo_Annotation__submsgs[1] = { + {.UPB_PRIVATE(subenum) = &google__protobuf__GeneratedCodeInfo__Annotation__Semantic_enum_init}, }; static const upb_MiniTableField google_protobuf_GeneratedCodeInfo_Annotation__fields[5] = { @@ -1155,7 +1155,7 @@ static const upb_MiniTableField google_protobuf_GeneratedCodeInfo_Annotation__fi }; const upb_MiniTable google__protobuf__GeneratedCodeInfo__Annotation_msg_init = { - &google_protobuf_GeneratedCodeInfo_Annotation_submsgs[0], + &google_protobuf_GeneratedCodeInfo_Annotation__submsgs[0], &google_protobuf_GeneratedCodeInfo_Annotation__fields[0], UPB_SIZE(40, 48), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(8), 0, #ifdef UPB_TRACING_ENABLED @@ -1168,7 +1168,7 @@ const upb_MiniTable google__protobuf__GeneratedCodeInfo__Annotation_msg_init = { }; const upb_MiniTable* google__protobuf__GeneratedCodeInfo__Annotation_msg_init_ptr = &google__protobuf__GeneratedCodeInfo__Annotation_msg_init; -const upb_MiniTableEnum google_protobuf_Edition_enum_init = { +const upb_MiniTableEnum google__protobuf__Edition_enum_init = { 64, 9, { @@ -1186,7 +1186,7 @@ const upb_MiniTableEnum google_protobuf_Edition_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_ExtensionRangeOptions_VerificationState_enum_init = { +const upb_MiniTableEnum google__protobuf__ExtensionRangeOptions__VerificationState_enum_init = { 64, 0, { @@ -1195,7 +1195,7 @@ const upb_MiniTableEnum google_protobuf_ExtensionRangeOptions_VerificationState_ }, }; -const upb_MiniTableEnum google_protobuf_FeatureSet_EnumType_enum_init = { +const upb_MiniTableEnum google__protobuf__FeatureSet__EnumType_enum_init = { 64, 0, { @@ -1204,7 +1204,7 @@ const upb_MiniTableEnum google_protobuf_FeatureSet_EnumType_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_FeatureSet_FieldPresence_enum_init = { +const upb_MiniTableEnum google__protobuf__FeatureSet__FieldPresence_enum_init = { 64, 0, { @@ -1213,7 +1213,7 @@ const upb_MiniTableEnum google_protobuf_FeatureSet_FieldPresence_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_FeatureSet_JsonFormat_enum_init = { +const upb_MiniTableEnum google__protobuf__FeatureSet__JsonFormat_enum_init = { 64, 0, { @@ -1222,7 +1222,7 @@ const upb_MiniTableEnum google_protobuf_FeatureSet_JsonFormat_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_FeatureSet_MessageEncoding_enum_init = { +const upb_MiniTableEnum google__protobuf__FeatureSet__MessageEncoding_enum_init = { 64, 0, { @@ -1231,7 +1231,7 @@ const upb_MiniTableEnum google_protobuf_FeatureSet_MessageEncoding_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init = { +const upb_MiniTableEnum google__protobuf__FeatureSet__RepeatedFieldEncoding_enum_init = { 64, 0, { @@ -1240,7 +1240,7 @@ const upb_MiniTableEnum google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_in }, }; -const upb_MiniTableEnum google_protobuf_FeatureSet_Utf8Validation_enum_init = { +const upb_MiniTableEnum google__protobuf__FeatureSet__Utf8Validation_enum_init = { 64, 0, { @@ -1249,7 +1249,7 @@ const upb_MiniTableEnum google_protobuf_FeatureSet_Utf8Validation_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Label_enum_init = { +const upb_MiniTableEnum google__protobuf__FieldDescriptorProto__Label_enum_init = { 64, 0, { @@ -1258,7 +1258,7 @@ const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Label_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Type_enum_init = { +const upb_MiniTableEnum google__protobuf__FieldDescriptorProto__Type_enum_init = { 64, 0, { @@ -1267,7 +1267,7 @@ const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Type_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_FieldOptions_CType_enum_init = { +const upb_MiniTableEnum google__protobuf__FieldOptions__CType_enum_init = { 64, 0, { @@ -1276,7 +1276,7 @@ const upb_MiniTableEnum google_protobuf_FieldOptions_CType_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_FieldOptions_JSType_enum_init = { +const upb_MiniTableEnum google__protobuf__FieldOptions__JSType_enum_init = { 64, 0, { @@ -1285,7 +1285,7 @@ const upb_MiniTableEnum google_protobuf_FieldOptions_JSType_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_FieldOptions_OptionRetention_enum_init = { +const upb_MiniTableEnum google__protobuf__FieldOptions__OptionRetention_enum_init = { 64, 0, { @@ -1294,7 +1294,7 @@ const upb_MiniTableEnum google_protobuf_FieldOptions_OptionRetention_enum_init = }, }; -const upb_MiniTableEnum google_protobuf_FieldOptions_OptionTargetType_enum_init = { +const upb_MiniTableEnum google__protobuf__FieldOptions__OptionTargetType_enum_init = { 64, 0, { @@ -1303,7 +1303,7 @@ const upb_MiniTableEnum google_protobuf_FieldOptions_OptionTargetType_enum_init }, }; -const upb_MiniTableEnum google_protobuf_FileOptions_OptimizeMode_enum_init = { +const upb_MiniTableEnum google__protobuf__FileOptions__OptimizeMode_enum_init = { 64, 0, { @@ -1312,7 +1312,7 @@ const upb_MiniTableEnum google_protobuf_FileOptions_OptimizeMode_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init = { +const upb_MiniTableEnum google__protobuf__GeneratedCodeInfo__Annotation__Semantic_enum_init = { 64, 0, { @@ -1321,7 +1321,7 @@ const upb_MiniTableEnum google_protobuf_GeneratedCodeInfo_Annotation_Semantic_en }, }; -const upb_MiniTableEnum google_protobuf_MethodOptions_IdempotencyLevel_enum_init = { +const upb_MiniTableEnum google__protobuf__MethodOptions__IdempotencyLevel_enum_init = { 64, 0, { @@ -1367,23 +1367,23 @@ static const upb_MiniTable *messages_layout[33] = { }; static const upb_MiniTableEnum *enums_layout[17] = { - &google_protobuf_Edition_enum_init, - &google_protobuf_ExtensionRangeOptions_VerificationState_enum_init, - &google_protobuf_FeatureSet_EnumType_enum_init, - &google_protobuf_FeatureSet_FieldPresence_enum_init, - &google_protobuf_FeatureSet_JsonFormat_enum_init, - &google_protobuf_FeatureSet_MessageEncoding_enum_init, - &google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init, - &google_protobuf_FeatureSet_Utf8Validation_enum_init, - &google_protobuf_FieldDescriptorProto_Label_enum_init, - &google_protobuf_FieldDescriptorProto_Type_enum_init, - &google_protobuf_FieldOptions_CType_enum_init, - &google_protobuf_FieldOptions_JSType_enum_init, - &google_protobuf_FieldOptions_OptionRetention_enum_init, - &google_protobuf_FieldOptions_OptionTargetType_enum_init, - &google_protobuf_FileOptions_OptimizeMode_enum_init, - &google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init, - &google_protobuf_MethodOptions_IdempotencyLevel_enum_init, + &google__protobuf__Edition_enum_init, + &google__protobuf__ExtensionRangeOptions__VerificationState_enum_init, + &google__protobuf__FeatureSet__EnumType_enum_init, + &google__protobuf__FeatureSet__FieldPresence_enum_init, + &google__protobuf__FeatureSet__JsonFormat_enum_init, + &google__protobuf__FeatureSet__MessageEncoding_enum_init, + &google__protobuf__FeatureSet__RepeatedFieldEncoding_enum_init, + &google__protobuf__FeatureSet__Utf8Validation_enum_init, + &google__protobuf__FieldDescriptorProto__Label_enum_init, + &google__protobuf__FieldDescriptorProto__Type_enum_init, + &google__protobuf__FieldOptions__CType_enum_init, + &google__protobuf__FieldOptions__JSType_enum_init, + &google__protobuf__FieldOptions__OptionRetention_enum_init, + &google__protobuf__FieldOptions__OptionTargetType_enum_init, + &google__protobuf__FileOptions__OptimizeMode_enum_init, + &google__protobuf__GeneratedCodeInfo__Annotation__Semantic_enum_init, + &google__protobuf__MethodOptions__IdempotencyLevel_enum_init, }; const upb_MiniTableFile google_protobuf_descriptor_proto_upb_file_layout = { diff --git a/upb/reflection/cmake/google/protobuf/descriptor.upb_minitable.h b/upb/reflection/cmake/google/protobuf/descriptor.upb_minitable.h index 6cb83ecedc..1dea594faf 100644 --- a/upb/reflection/cmake/google/protobuf/descriptor.upb_minitable.h +++ b/upb/reflection/cmake/google/protobuf/descriptor.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_MINITABLE_H_ -#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_MINITABLE_H_ +#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_MINITABLE_H_ +#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -85,23 +85,23 @@ extern const upb_MiniTable* google__protobuf__GeneratedCodeInfo_msg_init_ptr; extern const upb_MiniTable google__protobuf__GeneratedCodeInfo__Annotation_msg_init; extern const upb_MiniTable* google__protobuf__GeneratedCodeInfo__Annotation_msg_init_ptr; -extern const upb_MiniTableEnum google_protobuf_Edition_enum_init; -extern const upb_MiniTableEnum google_protobuf_ExtensionRangeOptions_VerificationState_enum_init; -extern const upb_MiniTableEnum google_protobuf_FeatureSet_EnumType_enum_init; -extern const upb_MiniTableEnum google_protobuf_FeatureSet_FieldPresence_enum_init; -extern const upb_MiniTableEnum google_protobuf_FeatureSet_JsonFormat_enum_init; -extern const upb_MiniTableEnum google_protobuf_FeatureSet_MessageEncoding_enum_init; -extern const upb_MiniTableEnum google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init; -extern const upb_MiniTableEnum google_protobuf_FeatureSet_Utf8Validation_enum_init; -extern const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Label_enum_init; -extern const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Type_enum_init; -extern const upb_MiniTableEnum google_protobuf_FieldOptions_CType_enum_init; -extern const upb_MiniTableEnum google_protobuf_FieldOptions_JSType_enum_init; -extern const upb_MiniTableEnum google_protobuf_FieldOptions_OptionRetention_enum_init; -extern const upb_MiniTableEnum google_protobuf_FieldOptions_OptionTargetType_enum_init; -extern const upb_MiniTableEnum google_protobuf_FileOptions_OptimizeMode_enum_init; -extern const upb_MiniTableEnum google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init; -extern const upb_MiniTableEnum google_protobuf_MethodOptions_IdempotencyLevel_enum_init; +extern const upb_MiniTableEnum google__protobuf__Edition_enum_init; +extern const upb_MiniTableEnum google__protobuf__ExtensionRangeOptions__VerificationState_enum_init; +extern const upb_MiniTableEnum google__protobuf__FeatureSet__EnumType_enum_init; +extern const upb_MiniTableEnum google__protobuf__FeatureSet__FieldPresence_enum_init; +extern const upb_MiniTableEnum google__protobuf__FeatureSet__JsonFormat_enum_init; +extern const upb_MiniTableEnum google__protobuf__FeatureSet__MessageEncoding_enum_init; +extern const upb_MiniTableEnum google__protobuf__FeatureSet__RepeatedFieldEncoding_enum_init; +extern const upb_MiniTableEnum google__protobuf__FeatureSet__Utf8Validation_enum_init; +extern const upb_MiniTableEnum google__protobuf__FieldDescriptorProto__Label_enum_init; +extern const upb_MiniTableEnum google__protobuf__FieldDescriptorProto__Type_enum_init; +extern const upb_MiniTableEnum google__protobuf__FieldOptions__CType_enum_init; +extern const upb_MiniTableEnum google__protobuf__FieldOptions__JSType_enum_init; +extern const upb_MiniTableEnum google__protobuf__FieldOptions__OptionRetention_enum_init; +extern const upb_MiniTableEnum google__protobuf__FieldOptions__OptionTargetType_enum_init; +extern const upb_MiniTableEnum google__protobuf__FileOptions__OptimizeMode_enum_init; +extern const upb_MiniTableEnum google__protobuf__GeneratedCodeInfo__Annotation__Semantic_enum_init; +extern const upb_MiniTableEnum google__protobuf__MethodOptions__IdempotencyLevel_enum_init; extern const upb_MiniTableFile google_protobuf_descriptor_proto_upb_file_layout; #ifdef __cplusplus @@ -110,4 +110,4 @@ extern const upb_MiniTableFile google_protobuf_descriptor_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_MINITABLE_H_ */ +#endif /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_MINITABLE_H_ */ diff --git a/upb_generator/cmake/google/protobuf/compiler/plugin.upb.h b/upb_generator/cmake/google/protobuf/compiler/plugin.upb.h index b7e939f254..d1592052c2 100644 --- a/upb_generator/cmake/google/protobuf/compiler/plugin.upb.h +++ b/upb_generator/cmake/google/protobuf/compiler/plugin.upb.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_PROTOBUF_COMPILER_PLUGIN_PROTO_UPB_H_ -#define GOOGLE_PROTOBUF_COMPILER_PLUGIN_PROTO_UPB_H_ +#ifndef GOOGLE_PROTOBUF_COMPILER_PLUGIN_PROTO_UPB_H__UPB_H_ +#define GOOGLE_PROTOBUF_COMPILER_PLUGIN_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -756,4 +756,4 @@ UPB_INLINE struct google_protobuf_GeneratedCodeInfo* google_protobuf_compiler_Co #include "upb/port/undef.inc" -#endif /* GOOGLE_PROTOBUF_COMPILER_PLUGIN_PROTO_UPB_H_ */ +#endif /* GOOGLE_PROTOBUF_COMPILER_PLUGIN_PROTO_UPB_H__UPB_H_ */ diff --git a/upb_generator/cmake/google/protobuf/compiler/plugin.upb_minitable.c b/upb_generator/cmake/google/protobuf/compiler/plugin.upb_minitable.c index 0aaf0cd87b..4592a65b4a 100644 --- a/upb_generator/cmake/google/protobuf/compiler/plugin.upb_minitable.c +++ b/upb_generator/cmake/google/protobuf/compiler/plugin.upb_minitable.c @@ -32,7 +32,7 @@ const upb_MiniTable google__protobuf__compiler__Version_msg_init = { }; const upb_MiniTable* google__protobuf__compiler__Version_msg_init_ptr = &google__protobuf__compiler__Version_msg_init; -static const upb_MiniTableSubInternal google_protobuf_compiler_CodeGeneratorRequest_submsgs[3] = { +static const upb_MiniTableSubInternal google_protobuf_compiler_CodeGeneratorRequest__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__compiler__Version_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__FileDescriptorProto_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__FileDescriptorProto_msg_init_ptr}, @@ -47,7 +47,7 @@ static const upb_MiniTableField google_protobuf_compiler_CodeGeneratorRequest__f }; const upb_MiniTable google__protobuf__compiler__CodeGeneratorRequest_msg_init = { - &google_protobuf_compiler_CodeGeneratorRequest_submsgs[0], + &google_protobuf_compiler_CodeGeneratorRequest__submsgs[0], &google_protobuf_compiler_CodeGeneratorRequest__fields[0], UPB_SIZE(40, 64), 5, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(248), 0, #ifdef UPB_TRACING_ENABLED @@ -90,7 +90,7 @@ const upb_MiniTable google__protobuf__compiler__CodeGeneratorRequest_msg_init = }; const upb_MiniTable* google__protobuf__compiler__CodeGeneratorRequest_msg_init_ptr = &google__protobuf__compiler__CodeGeneratorRequest_msg_init; -static const upb_MiniTableSubInternal google_protobuf_compiler_CodeGeneratorResponse_submsgs[1] = { +static const upb_MiniTableSubInternal google_protobuf_compiler_CodeGeneratorResponse__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__compiler__CodeGeneratorResponse__File_msg_init_ptr}, }; @@ -103,7 +103,7 @@ static const upb_MiniTableField google_protobuf_compiler_CodeGeneratorResponse__ }; const upb_MiniTable google__protobuf__compiler__CodeGeneratorResponse_msg_init = { - &google_protobuf_compiler_CodeGeneratorResponse_submsgs[0], + &google_protobuf_compiler_CodeGeneratorResponse__submsgs[0], &google_protobuf_compiler_CodeGeneratorResponse__fields[0], UPB_SIZE(40, 56), 5, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(120), 0, #ifdef UPB_TRACING_ENABLED @@ -130,7 +130,7 @@ const upb_MiniTable google__protobuf__compiler__CodeGeneratorResponse_msg_init = }; const upb_MiniTable* google__protobuf__compiler__CodeGeneratorResponse_msg_init_ptr = &google__protobuf__compiler__CodeGeneratorResponse_msg_init; -static const upb_MiniTableSubInternal google_protobuf_compiler_CodeGeneratorResponse_File_submsgs[1] = { +static const upb_MiniTableSubInternal google_protobuf_compiler_CodeGeneratorResponse_File__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__GeneratedCodeInfo_msg_init_ptr}, }; @@ -142,7 +142,7 @@ static const upb_MiniTableField google_protobuf_compiler_CodeGeneratorResponse_F }; const upb_MiniTable google__protobuf__compiler__CodeGeneratorResponse__File_msg_init = { - &google_protobuf_compiler_CodeGeneratorResponse_File_submsgs[0], + &google_protobuf_compiler_CodeGeneratorResponse_File__submsgs[0], &google_protobuf_compiler_CodeGeneratorResponse_File__fields[0], UPB_SIZE(40, 72), 4, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, #ifdef UPB_TRACING_ENABLED @@ -151,7 +151,7 @@ const upb_MiniTable google__protobuf__compiler__CodeGeneratorResponse__File_msg_ }; const upb_MiniTable* google__protobuf__compiler__CodeGeneratorResponse__File_msg_init_ptr = &google__protobuf__compiler__CodeGeneratorResponse__File_msg_init; -const upb_MiniTableEnum google_protobuf_compiler_CodeGeneratorResponse_Feature_enum_init = { +const upb_MiniTableEnum google__protobuf__compiler__CodeGeneratorResponse__Feature_enum_init = { 64, 0, { @@ -168,7 +168,7 @@ static const upb_MiniTable *messages_layout[4] = { }; static const upb_MiniTableEnum *enums_layout[1] = { - &google_protobuf_compiler_CodeGeneratorResponse_Feature_enum_init, + &google__protobuf__compiler__CodeGeneratorResponse__Feature_enum_init, }; const upb_MiniTableFile google_protobuf_compiler_plugin_proto_upb_file_layout = { diff --git a/upb_generator/cmake/google/protobuf/compiler/plugin.upb_minitable.h b/upb_generator/cmake/google/protobuf/compiler/plugin.upb_minitable.h index 40b8eb6e96..d08d710d3b 100644 --- a/upb_generator/cmake/google/protobuf/compiler/plugin.upb_minitable.h +++ b/upb_generator/cmake/google/protobuf/compiler/plugin.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_PROTOBUF_COMPILER_PLUGIN_PROTO_UPB_MINITABLE_H_ -#define GOOGLE_PROTOBUF_COMPILER_PLUGIN_PROTO_UPB_MINITABLE_H_ +#ifndef GOOGLE_PROTOBUF_COMPILER_PLUGIN_PROTO_UPB_H__UPB_MINITABLE_H_ +#define GOOGLE_PROTOBUF_COMPILER_PLUGIN_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -27,7 +27,7 @@ extern const upb_MiniTable* google__protobuf__compiler__CodeGeneratorResponse_ms extern const upb_MiniTable google__protobuf__compiler__CodeGeneratorResponse__File_msg_init; extern const upb_MiniTable* google__protobuf__compiler__CodeGeneratorResponse__File_msg_init_ptr; -extern const upb_MiniTableEnum google_protobuf_compiler_CodeGeneratorResponse_Feature_enum_init; +extern const upb_MiniTableEnum google__protobuf__compiler__CodeGeneratorResponse__Feature_enum_init; extern const upb_MiniTableFile google_protobuf_compiler_plugin_proto_upb_file_layout; #ifdef __cplusplus @@ -36,4 +36,4 @@ extern const upb_MiniTableFile google_protobuf_compiler_plugin_proto_upb_file_la #include "upb/port/undef.inc" -#endif /* GOOGLE_PROTOBUF_COMPILER_PLUGIN_PROTO_UPB_MINITABLE_H_ */ +#endif /* GOOGLE_PROTOBUF_COMPILER_PLUGIN_PROTO_UPB_H__UPB_MINITABLE_H_ */