[ObjC] Add the debug runtime check to more startup cases.
Descriptor was relying on the Root for the runtime check, but since the Root is
only startup up when needed, add the debug runtime check to the cases where the
Root isn't started up.
EnumDescriptors are normally started up by fields, but a developer could
directly call the public apis, so add the debug runtime check for safety sake.
PiperOrigin-RevId: 506062884
diff --git a/objectivec/GPBAny.pbobjc.m b/objectivec/GPBAny.pbobjc.m
index 9e474ee..51328b0 100644
--- a/objectivec/GPBAny.pbobjc.m
+++ b/objectivec/GPBAny.pbobjc.m
@@ -52,6 +52,7 @@
+ (GPBDescriptor *)descriptor {
static GPBDescriptor *descriptor = nil;
if (!descriptor) {
+ GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
static GPBMessageFieldDescription fields[] = {
{
.name = "typeURL",
diff --git a/objectivec/GPBApi.pbobjc.m b/objectivec/GPBApi.pbobjc.m
index 2282fd2..12572e9 100644
--- a/objectivec/GPBApi.pbobjc.m
+++ b/objectivec/GPBApi.pbobjc.m
@@ -72,6 +72,7 @@
+ (GPBDescriptor *)descriptor {
static GPBDescriptor *descriptor = nil;
if (!descriptor) {
+ GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
static GPBMessageFieldDescription fields[] = {
{
.name = "name",
@@ -192,6 +193,7 @@
+ (GPBDescriptor *)descriptor {
static GPBDescriptor *descriptor = nil;
if (!descriptor) {
+ GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
static GPBMessageFieldDescription fields[] = {
{
.name = "name",
@@ -309,6 +311,7 @@
+ (GPBDescriptor *)descriptor {
static GPBDescriptor *descriptor = nil;
if (!descriptor) {
+ GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
static GPBMessageFieldDescription fields[] = {
{
.name = "name",
diff --git a/objectivec/GPBDuration.pbobjc.m b/objectivec/GPBDuration.pbobjc.m
index 9d7ebe9..0723a62 100644
--- a/objectivec/GPBDuration.pbobjc.m
+++ b/objectivec/GPBDuration.pbobjc.m
@@ -52,6 +52,7 @@
+ (GPBDescriptor *)descriptor {
static GPBDescriptor *descriptor = nil;
if (!descriptor) {
+ GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
static GPBMessageFieldDescription fields[] = {
{
.name = "seconds",
diff --git a/objectivec/GPBEmpty.pbobjc.m b/objectivec/GPBEmpty.pbobjc.m
index b160c4f..997e398 100644
--- a/objectivec/GPBEmpty.pbobjc.m
+++ b/objectivec/GPBEmpty.pbobjc.m
@@ -48,6 +48,7 @@
+ (GPBDescriptor *)descriptor {
static GPBDescriptor *descriptor = nil;
if (!descriptor) {
+ GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
GPBDescriptor *localDescriptor =
[GPBDescriptor allocDescriptorForClass:[GPBEmpty class]
file:GPBEmptyRoot_FileDescriptor()
diff --git a/objectivec/GPBFieldMask.pbobjc.m b/objectivec/GPBFieldMask.pbobjc.m
index 6acb77f..c12b14f 100644
--- a/objectivec/GPBFieldMask.pbobjc.m
+++ b/objectivec/GPBFieldMask.pbobjc.m
@@ -50,6 +50,7 @@
+ (GPBDescriptor *)descriptor {
static GPBDescriptor *descriptor = nil;
if (!descriptor) {
+ GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
static GPBMessageFieldDescription fields[] = {
{
.name = "pathsArray",
diff --git a/objectivec/GPBSourceContext.pbobjc.m b/objectivec/GPBSourceContext.pbobjc.m
index 61c2d4c..bfd4439 100644
--- a/objectivec/GPBSourceContext.pbobjc.m
+++ b/objectivec/GPBSourceContext.pbobjc.m
@@ -50,6 +50,7 @@
+ (GPBDescriptor *)descriptor {
static GPBDescriptor *descriptor = nil;
if (!descriptor) {
+ GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
static GPBMessageFieldDescription fields[] = {
{
.name = "fileName",
diff --git a/objectivec/GPBStruct.pbobjc.m b/objectivec/GPBStruct.pbobjc.m
index 96bf792..5922057 100644
--- a/objectivec/GPBStruct.pbobjc.m
+++ b/objectivec/GPBStruct.pbobjc.m
@@ -51,6 +51,7 @@
GPBEnumDescriptor *GPBNullValue_EnumDescriptor(void) {
static _Atomic(GPBEnumDescriptor*) descriptor = nil;
if (!descriptor) {
+ GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
static const char *valueNames =
"NullValue\000";
static const int32_t values[] = {
@@ -96,6 +97,7 @@
+ (GPBDescriptor *)descriptor {
static GPBDescriptor *descriptor = nil;
if (!descriptor) {
+ GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
static GPBMessageFieldDescription fields[] = {
{
.name = "fields",
@@ -150,6 +152,7 @@
+ (GPBDescriptor *)descriptor {
static GPBDescriptor *descriptor = nil;
if (!descriptor) {
+ GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
static GPBMessageFieldDescription fields[] = {
{
.name = "nullValue",
@@ -262,6 +265,7 @@
+ (GPBDescriptor *)descriptor {
static GPBDescriptor *descriptor = nil;
if (!descriptor) {
+ GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
static GPBMessageFieldDescription fields[] = {
{
.name = "valuesArray",
diff --git a/objectivec/GPBTimestamp.pbobjc.m b/objectivec/GPBTimestamp.pbobjc.m
index 927eb94..7fcfa1a 100644
--- a/objectivec/GPBTimestamp.pbobjc.m
+++ b/objectivec/GPBTimestamp.pbobjc.m
@@ -52,6 +52,7 @@
+ (GPBDescriptor *)descriptor {
static GPBDescriptor *descriptor = nil;
if (!descriptor) {
+ GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
static GPBMessageFieldDescription fields[] = {
{
.name = "seconds",
diff --git a/objectivec/GPBType.pbobjc.m b/objectivec/GPBType.pbobjc.m
index c01d97f..5d93b69 100644
--- a/objectivec/GPBType.pbobjc.m
+++ b/objectivec/GPBType.pbobjc.m
@@ -52,6 +52,7 @@
GPBEnumDescriptor *GPBSyntax_EnumDescriptor(void) {
static _Atomic(GPBEnumDescriptor*) descriptor = nil;
if (!descriptor) {
+ GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
static const char *valueNames =
"SyntaxProto2\000SyntaxProto3\000";
static const int32_t values[] = {
@@ -88,6 +89,7 @@
GPBEnumDescriptor *GPBField_Kind_EnumDescriptor(void) {
static _Atomic(GPBEnumDescriptor*) descriptor = nil;
if (!descriptor) {
+ GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
static const char *valueNames =
"TypeUnknown\000TypeDouble\000TypeFloat\000TypeInt"
"64\000TypeUint64\000TypeInt32\000TypeFixed64\000Type"
@@ -163,6 +165,7 @@
GPBEnumDescriptor *GPBField_Cardinality_EnumDescriptor(void) {
static _Atomic(GPBEnumDescriptor*) descriptor = nil;
if (!descriptor) {
+ GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
static const char *valueNames =
"CardinalityUnknown\000CardinalityOptional\000C"
"ardinalityRequired\000CardinalityRepeated\000";
@@ -225,6 +228,7 @@
+ (GPBDescriptor *)descriptor {
static GPBDescriptor *descriptor = nil;
if (!descriptor) {
+ GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
static GPBMessageFieldDescription fields[] = {
{
.name = "name",
@@ -343,6 +347,7 @@
+ (GPBDescriptor *)descriptor {
static GPBDescriptor *descriptor = nil;
if (!descriptor) {
+ GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
static GPBMessageFieldDescription fields[] = {
{
.name = "kind",
@@ -505,6 +510,7 @@
+ (GPBDescriptor *)descriptor {
static GPBDescriptor *descriptor = nil;
if (!descriptor) {
+ GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
static GPBMessageFieldDescription fields[] = {
{
.name = "name",
@@ -601,6 +607,7 @@
+ (GPBDescriptor *)descriptor {
static GPBDescriptor *descriptor = nil;
if (!descriptor) {
+ GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
static GPBMessageFieldDescription fields[] = {
{
.name = "name",
@@ -665,6 +672,7 @@
+ (GPBDescriptor *)descriptor {
static GPBDescriptor *descriptor = nil;
if (!descriptor) {
+ GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
static GPBMessageFieldDescription fields[] = {
{
.name = "name",
diff --git a/objectivec/GPBWrappers.pbobjc.m b/objectivec/GPBWrappers.pbobjc.m
index 29debaa..79043b9 100644
--- a/objectivec/GPBWrappers.pbobjc.m
+++ b/objectivec/GPBWrappers.pbobjc.m
@@ -50,6 +50,7 @@
+ (GPBDescriptor *)descriptor {
static GPBDescriptor *descriptor = nil;
if (!descriptor) {
+ GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
static GPBMessageFieldDescription fields[] = {
{
.name = "value",
@@ -94,6 +95,7 @@
+ (GPBDescriptor *)descriptor {
static GPBDescriptor *descriptor = nil;
if (!descriptor) {
+ GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
static GPBMessageFieldDescription fields[] = {
{
.name = "value",
@@ -138,6 +140,7 @@
+ (GPBDescriptor *)descriptor {
static GPBDescriptor *descriptor = nil;
if (!descriptor) {
+ GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
static GPBMessageFieldDescription fields[] = {
{
.name = "value",
@@ -182,6 +185,7 @@
+ (GPBDescriptor *)descriptor {
static GPBDescriptor *descriptor = nil;
if (!descriptor) {
+ GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
static GPBMessageFieldDescription fields[] = {
{
.name = "value",
@@ -226,6 +230,7 @@
+ (GPBDescriptor *)descriptor {
static GPBDescriptor *descriptor = nil;
if (!descriptor) {
+ GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
static GPBMessageFieldDescription fields[] = {
{
.name = "value",
@@ -270,6 +275,7 @@
+ (GPBDescriptor *)descriptor {
static GPBDescriptor *descriptor = nil;
if (!descriptor) {
+ GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
static GPBMessageFieldDescription fields[] = {
{
.name = "value",
@@ -313,6 +319,7 @@
+ (GPBDescriptor *)descriptor {
static GPBDescriptor *descriptor = nil;
if (!descriptor) {
+ GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
static GPBMessageFieldDescription fields[] = {
{
.name = "value",
@@ -357,6 +364,7 @@
+ (GPBDescriptor *)descriptor {
static GPBDescriptor *descriptor = nil;
if (!descriptor) {
+ GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
static GPBMessageFieldDescription fields[] = {
{
.name = "value",
@@ -401,6 +409,7 @@
+ (GPBDescriptor *)descriptor {
static GPBDescriptor *descriptor = nil;
if (!descriptor) {
+ GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
static GPBMessageFieldDescription fields[] = {
{
.name = "value",
