[ObjC] Only use the enum descriptor close/open state.

Historically this was tracked on the fields, but the state is now always on the enum descriptor. Update to ensure the two trackings match, but move the functionality over to use the info from the descriptor so the field part can eventually be mored. PiperOrigin-RevId: 721012133
mkruskal-google · Jan 29, 2025 · 7f3dce4 · 7f3dce4
1 parent 14cceb5
commit 7f3dce4
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 10 deletions.
diff --git a/objectivec/GPBDescriptor.m b/objectivec/GPBDescriptor.m
@@ -490,6 +490,15 @@ - (instancetype)initWithFieldDescription:(void *)description
       NSAssert((coreDesc->flags & GPBFieldHasEnumDescriptor) != 0,
                @"Field must have GPBFieldHasEnumDescriptor set");
 #endif  // DEBUG
+#if defined(DEBUG) && DEBUG && !defined(NS_BLOCK_ASSERTIONS)
+      if (enumDescriptor_.isClosed) {
+        NSAssert((coreDesc->flags & GPBFieldClosedEnum) != 0,
+                 @"Field must have GPBFieldClosedEnum set");
+      } else {
+        NSAssert((coreDesc->flags & GPBFieldClosedEnum) == 0,
+                 @"Field must not have GPBFieldClosedEnum set");
+      }
+#endif  // defined(DEBUG) && DEBUG && !NS_BLOCK_ASSERTIONS
     }
 
     BOOL isMapOrArray = GPBFieldIsMapOrArray(self);
@@ -781,6 +790,10 @@ - (BOOL)isClosed {
   return (flags_ & GPBEnumDescriptorInitializationFlag_IsClosed) != 0;
 }
 
+- (BOOL)isOpenOrValidValue:(int32_t)value {
+  return (flags_ & GPBEnumDescriptorInitializationFlag_IsClosed) == 0 || enumVerifier_(value);
+}
+
 - (void)calcValueNameOffsets {
   @synchronized(self) {
     if (nameOffsets_ != NULL) {

diff --git a/objectivec/GPBDescriptor_PackagePrivate.h b/objectivec/GPBDescriptor_PackagePrivate.h
@@ -236,6 +236,7 @@ typedef NS_OPTIONS(uint32_t, GPBEnumDescriptorInitializationFlags) {
                                  flags:(GPBEnumDescriptorInitializationFlags)flags
                    extraTextFormatInfo:(const char *)extraTextFormatInfo;
 
+- (BOOL)isOpenOrValidValue:(int32_t)value;
 @end
 
 @interface GPBExtensionDescriptor () {
@@ -281,10 +282,6 @@ GPB_INLINE uint32_t GPBFieldNumber(GPBFieldDescriptor *field) {
   return field->description_->number;
 }
 
-GPB_INLINE BOOL GPBFieldIsClosedEnum(GPBFieldDescriptor *field) {
-  return (field->description_->flags & GPBFieldClosedEnum) != 0;
-}
-
 #pragma clang diagnostic pop
 
 uint32_t GPBFieldTag(GPBFieldDescriptor *self);

diff --git a/objectivec/GPBDictionary.m b/objectivec/GPBDictionary.m
@@ -484,7 +484,7 @@ void GPBDictionaryReadEntry(id mapDictionary, GPBCodedInputStream *stream,
       [(NSMutableDictionary *)mapDictionary setObject:value.valueString forKey:key.valueString];
     } else {
       if (valueDataType == GPBDataTypeEnum) {
-        if (!GPBFieldIsClosedEnum(field) || [field isValidEnumValue:value.valueEnum]) {
+        if ([field.enumDescriptor isOpenOrValidValue:value.valueEnum]) {
           [mapDictionary setGPBGenericValue:&value forGPBGenericValueKey:&key];
         } else {
           NSData *data = [mapDictionary serializedDataForUnknownValue:value.valueEnum

diff --git a/objectivec/GPBMessage.m b/objectivec/GPBMessage.m
@@ -2464,7 +2464,7 @@ static void MergeSingleFieldFromCodedInputStream(GPBMessage *self, GPBFieldDescr
 
     case GPBDataTypeEnum: {
       int32_t val = GPBCodedInputStreamReadEnum(&input->state_);
-      if (!GPBFieldIsClosedEnum(field) || [field isValidEnumValue:val]) {
+      if ([field.enumDescriptor isOpenOrValidValue:val]) {
         GPBSetInt32IvarWithFieldPrivate(self, field, val);
       } else {
         AddUnknownFieldVarint32(self, GPBFieldNumber(field), val);
@@ -2513,7 +2513,7 @@ static void MergeRepeatedPackedFieldFromCodedInputStream(GPBMessage *self,
 
       case GPBDataTypeEnum: {
         int32_t val = GPBCodedInputStreamReadEnum(state);
-        if (!GPBFieldIsClosedEnum(field) || [field isValidEnumValue:val]) {
+        if ([field.enumDescriptor isOpenOrValidValue:val]) {
           [(GPBEnumArray *)genericArray addRawValue:val];
         } else {
           AddUnknownFieldVarint32(self, GPBFieldNumber(field), val);
@@ -2581,7 +2581,7 @@ static void MergeRepeatedNotPackedFieldFromCodedInputStream(
     }
     case GPBDataTypeEnum: {
       int32_t val = GPBCodedInputStreamReadEnum(state);
-      if (!GPBFieldIsClosedEnum(field) || [field isValidEnumValue:val]) {
+      if ([field.enumDescriptor isOpenOrValidValue:val]) {
         [(GPBEnumArray *)genericArray addRawValue:val];
       } else {
         AddUnknownFieldVarint32(self, GPBFieldNumber(field), val);

diff --git a/objectivec/GPBUtilities.m b/objectivec/GPBUtilities.m
@@ -646,8 +646,7 @@ int32_t GPBGetMessageEnumField(GPBMessage *self, GPBFieldDescriptor *field) {
   int32_t result = GPBGetMessageInt32Field(self, field);
   // If this is presevering unknown enums, make sure the value is valid before
   // returning it.
-
-  if (!GPBFieldIsClosedEnum(field) && ![field isValidEnumValue:result]) {
+  if (!field.enumDescriptor.isClosed && ![field isValidEnumValue:result]) {
     result = kGPBUnrecognizedEnumeratorValue;
   }
   return result;