[ObjC] Small shuffling for code quality/style.

- Add some casts to avoid warnings with signed/unsigned comparisons.
- Use `objc_direct` for some internal helpers and get out of having the one class know about the internals of the other class.
- Update GPBUtilities to not need to know internals of these

PiperOrigin-RevId: 908844212

Author: thomasvl

objectivec/GPBUnknownField.m

@@ -20,7 +20,16 @@
                 format:@"GPBUnknownField is the wrong type"]; \
   }
 
-@implementation GPBUnknownField
+@implementation GPBUnknownField {
+  int32_t number_;
+  GPBUnknownFieldType type_;
+
+  union {
+    uint64_t intValue;                 // type == Varint, Fixed32, Fixed64
+    NSData *_Nonnull lengthDelimited;  // type == LengthDelimited
+    GPBUnknownFields *_Nonnull group;  // type == Group
+  } storage_;
+}
 
 @synthesize number = number_;
 @synthesize type = type_;
@@ -158,8 +167,8 @@ - (BOOL)isEqual:(id)object {
 }
 
 - (NSUInteger)hash {
-  const int prime = 31;
-  NSUInteger result = prime * number_ + type_;
+  const NSUInteger prime = 31;
+  NSUInteger result = prime * (NSUInteger)number_ + type_;
   switch (type_) {
     case GPBUnknownFieldTypeVarint:
     case GPBUnknownFieldTypeFixed32:
@@ -198,6 +207,47 @@ - (NSString *)description {
   return description;
 }
 
+#pragma mark - Internal Methods
+
+- (size_t)computeSerializedSize {
+  switch (type_) {
+    case GPBUnknownFieldTypeVarint:
+      return GPBComputeUInt64Size(number_, storage_.intValue);
+    case GPBUnknownFieldTypeFixed32:
+      return GPBComputeFixed32Size(number_, (uint32_t)storage_.intValue);
+    case GPBUnknownFieldTypeFixed64:
+      return GPBComputeFixed64Size(number_, storage_.intValue);
+    case GPBUnknownFieldTypeLengthDelimited:
+      return GPBComputeBytesSize(number_, storage_.lengthDelimited);
+    case GPBUnknownFieldTypeGroup:
+      return (GPBComputeTagSize(number_) * 2) + [storage_.group computeSerializedSize];
+  }
+}
+
+- (void)writeToCodedOutputStream:(nonnull GPBCodedOutputStream *)output {
+  switch (type_) {
+    case GPBUnknownFieldTypeVarint:
+      [output writeUInt64:number_ value:storage_.intValue];
+      break;
+    case GPBUnknownFieldTypeFixed32:
+      [output writeFixed32:number_ value:(uint32_t)storage_.intValue];
+      break;
+    case GPBUnknownFieldTypeFixed64:
+      [output writeFixed64:number_ value:storage_.intValue];
+      break;
+    case GPBUnknownFieldTypeLengthDelimited:
+      [output writeBytes:number_ value:storage_.lengthDelimited];
+      break;
+    case GPBUnknownFieldTypeGroup:
+      [output writeRawVarint32:(int32_t)GPBWireFormatMakeTag((uint32_t)number_,
+                                                             GPBWireFormatStartGroup)];
+      [storage_.group writeToCodedOutputStream:output];
+      [output
+          writeRawVarint32:(int32_t)GPBWireFormatMakeTag((uint32_t)number_, GPBWireFormatEndGroup)];
+      break;
+  }
+}
+
 #pragma clang diagnostic pop
 
 @end

objectivec/GPBUnknownField_PackagePrivate.h

@@ -9,22 +9,16 @@
 
 #import "GPBUnknownField.h"
 
-@interface GPBUnknownField () {
- @package
-  int32_t number_;
-  GPBUnknownFieldType type_;
-
-  union {
-    uint64_t intValue;                 // type == Varint, Fixed32, Fixed64
-    NSData *_Nonnull lengthDelimited;  // type == LengthDelimited
-    GPBUnknownFields *_Nonnull group;  // type == Group
-  } storage_;
-}
+@interface GPBUnknownField ()
 
 - (nonnull instancetype)initWithNumber:(int32_t)number varint:(uint64_t)varint;
 - (nonnull instancetype)initWithNumber:(int32_t)number fixed32:(uint32_t)fixed32;
 - (nonnull instancetype)initWithNumber:(int32_t)number fixed64:(uint64_t)fixed64;
 - (nonnull instancetype)initWithNumber:(int32_t)number lengthDelimited:(nonnull NSData *)data;
 - (nonnull instancetype)initWithNumber:(int32_t)number group:(nonnull GPBUnknownFields *)group;
 
+- (size_t)computeSerializedSize __attribute__((objc_direct));
+- (void)writeToCodedOutputStream:(nonnull GPBCodedOutputStream *)output
+    __attribute__((objc_direct));
+
 @end

objectivec/GPBUnknownFields.m

@@ -42,60 +42,6 @@ @interface GPBUnknownFields () {
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdirect-ivar-access"
 
-GPB_NOINLINE
-static size_t ComputeSerializeSize(GPBUnknownFields *_Nonnull self) {
-  size_t result = 0;
-  for (GPBUnknownField *field in self->fields_) {
-    uint32_t fieldNumber = field->number_;
-    switch (field->type_) {
-      case GPBUnknownFieldTypeVarint:
-        result += GPBComputeUInt64Size(fieldNumber, field->storage_.intValue);
-        break;
-      case GPBUnknownFieldTypeFixed32:
-        result += GPBComputeFixed32Size(fieldNumber, (uint32_t)field->storage_.intValue);
-        break;
-      case GPBUnknownFieldTypeFixed64:
-        result += GPBComputeFixed64Size(fieldNumber, field->storage_.intValue);
-        break;
-      case GPBUnknownFieldTypeLengthDelimited:
-        result += GPBComputeBytesSize(fieldNumber, field->storage_.lengthDelimited);
-        break;
-      case GPBUnknownFieldTypeGroup:
-        result +=
-            (GPBComputeTagSize(fieldNumber) * 2) + ComputeSerializeSize(field->storage_.group);
-        break;
-    }
-  }
-  return result;
-}
-
-GPB_NOINLINE
-static void WriteToCoddedOutputStream(GPBUnknownFields *_Nonnull self,
-                                      GPBCodedOutputStream *_Nonnull output) {
-  for (GPBUnknownField *field in self->fields_) {
-    uint32_t fieldNumber = field->number_;
-    switch (field->type_) {
-      case GPBUnknownFieldTypeVarint:
-        [output writeUInt64:fieldNumber value:field->storage_.intValue];
-        break;
-      case GPBUnknownFieldTypeFixed32:
-        [output writeFixed32:fieldNumber value:(uint32_t)field->storage_.intValue];
-        break;
-      case GPBUnknownFieldTypeFixed64:
-        [output writeFixed64:fieldNumber value:field->storage_.intValue];
-        break;
-      case GPBUnknownFieldTypeLengthDelimited:
-        [output writeBytes:fieldNumber value:field->storage_.lengthDelimited];
-        break;
-      case GPBUnknownFieldTypeGroup:
-        [output writeRawVarint32:GPBWireFormatMakeTag(fieldNumber, GPBWireFormatStartGroup)];
-        WriteToCoddedOutputStream(field->storage_.group, output);
-        [output writeRawVarint32:GPBWireFormatMakeTag(fieldNumber, GPBWireFormatEndGroup)];
-        break;
-    }
-  }
-}
-
 GPB_NOINLINE
 static BOOL MergeFromInputStream(GPBUnknownFields *self, GPBCodedInputStream *input,
                                  uint32_t endTag) {
@@ -107,7 +53,7 @@ static BOOL MergeFromInputStream(GPBUnknownFields *self, GPBCodedInputStream *in
   NSMutableArray<GPBUnknownField *> *fields = self->fields_;
   @try {
     while (YES) {
-      uint32_t tag = GPBCodedInputStreamReadTag(state);
+      uint32_t tag = (uint32_t)GPBCodedInputStreamReadTag(state);
       if (tag == endTag) {
         return YES;
       }
@@ -116,10 +62,10 @@ static BOOL MergeFromInputStream(GPBUnknownFields *self, GPBCodedInputStream *in
         return NO;
       }
       GPBWireFormat wireType = GPBWireFormatGetTagWireType(tag);
-      int32_t fieldNumber = GPBWireFormatGetTagFieldNumber(tag);
+      int32_t fieldNumber = (int32_t)GPBWireFormatGetTagFieldNumber(tag);
       switch (wireType) {
         case GPBWireFormatVarint: {
-          uint64_t value = GPBCodedInputStreamReadInt64(state);
+          uint64_t value = (uint64_t)GPBCodedInputStreamReadInt64(state);
           GPBUnknownField *field = [[GPBUnknownField alloc] initWithNumber:fieldNumber
                                                                     varint:value];
           [fields addObject:field];
@@ -157,9 +103,9 @@ static BOOL MergeFromInputStream(GPBUnknownFields *self, GPBCodedInputStream *in
           [fields addObject:field];
           [field release];
           [group release];  // Still will be held in the field/fields.
-          uint32_t endGroupTag = GPBWireFormatMakeTag(fieldNumber, GPBWireFormatEndGroup);
+          uint32_t endGroupTag = GPBWireFormatMakeTag((uint32_t)fieldNumber, GPBWireFormatEndGroup);
           if (MergeFromInputStream(group, input, endGroupTag)) {
-            GPBCodedInputStreamCheckLastTagWas(state, endGroupTag);
+            GPBCodedInputStreamCheckLastTagWas(state, (int32_t)endGroupTag);
           } else {
             [NSException
                  raise:NSInternalInconsistencyException
@@ -332,7 +278,7 @@ - (void)clearFieldNumber:(int32_t)fieldNumber {
   NSMutableIndexSet *toRemove = nil;
   NSUInteger idx = 0;
   for (GPBUnknownField *field in fields_) {
-    if (field->number_ == fieldNumber) {
+    if (field.number == fieldNumber) {
       if (toRemove == nil) {
         toRemove = [[NSMutableIndexSet alloc] initWithIndex:idx];
       } else {
@@ -361,11 +307,11 @@ - (NSData *)serializeAsData {
   if (fields_.count == 0) {
     return [NSData data];
   }
-  size_t expectedSize = ComputeSerializeSize(self);
+  size_t expectedSize = [self computeSerializedSize];
   NSMutableData *data = [NSMutableData dataWithLength:expectedSize];
   GPBCodedOutputStream *stream = [[GPBCodedOutputStream alloc] initWithData:data];
   @try {
-    WriteToCoddedOutputStream(self, stream);
+    [self writeToCodedOutputStream:stream];
     [stream flush];
   } @catch (NSException *exception) {
 #if defined(DEBUG) && DEBUG
@@ -379,6 +325,20 @@ - (NSData *)serializeAsData {
   return data;
 }
 
+- (size_t)computeSerializedSize {
+  size_t result = 0;
+  for (GPBUnknownField *field in self->fields_) {
+    result += [field computeSerializedSize];
+  }
+  return result;
+}
+
+- (void)writeToCodedOutputStream:(nonnull GPBCodedOutputStream *)output {
+  for (GPBUnknownField *field in self->fields_) {
+    [field writeToCodedOutputStream:output];
+  }
+}
+
 @end
 
 @implementation GPBUnknownFields (AccessHelpers)

objectivec/GPBUnknownFields_PackagePrivate.h

@@ -12,5 +12,8 @@
 @interface GPBUnknownFields ()
 
 - (nonnull NSData *)serializeAsData;
+- (size_t)computeSerializedSize __attribute__((objc_direct));
+- (void)writeToCodedOutputStream:(nonnull GPBCodedOutputStream *)output
+    __attribute__((objc_direct));
 
 @end

objectivec/GPBUtilities.m

@@ -18,7 +18,6 @@
 #import "GPBMessage.h"
 #import "GPBMessage_PackagePrivate.h"
 #import "GPBUnknownField.h"
-#import "GPBUnknownField_PackagePrivate.h"
 #import "GPBUnknownFields.h"
 #import "GPBUtilities.h"
 #import "GPBUtilities_PackagePrivate.h"
@@ -1941,8 +1940,8 @@ static void AppendTextFormatForUnknownFields(GPBUnknownFields *ufs, NSMutableStr
   [sortedFields
       sortWithOptions:NSSortStable
       usingComparator:^NSComparisonResult(GPBUnknownField *field1, GPBUnknownField *field2) {
-        int32_t fieldNumber1 = field1->number_;
-        int32_t fieldNumber2 = field2->number_;
+        int32_t fieldNumber1 = field1.number;
+        int32_t fieldNumber2 = field2.number;
         if (fieldNumber1 < fieldNumber2) {
           return NSOrderedAscending;
         } else if (fieldNumber1 > fieldNumber2) {
@@ -1955,25 +1954,24 @@ static void AppendTextFormatForUnknownFields(GPBUnknownFields *ufs, NSMutableStr
   NSString *subIndent = nil;
 
   for (GPBUnknownField *field in sortedFields) {
-    int32_t fieldNumber = field->number_;
-    switch (field->type_) {
+    int32_t fieldNumber = field.number;
+    switch (field.type) {
       case GPBUnknownFieldTypeVarint:
-        [toStr appendFormat:@"%@%d: %llu\n", lineIndent, fieldNumber, field->storage_.intValue];
+        [toStr appendFormat:@"%@%d: %llu\n", lineIndent, fieldNumber, field.varint];
         break;
       case GPBUnknownFieldTypeFixed32:
-        [toStr appendFormat:@"%@%d: 0x%X\n", lineIndent, fieldNumber,
-                            (uint32_t)field->storage_.intValue];
+        [toStr appendFormat:@"%@%d: 0x%X\n", lineIndent, fieldNumber, field.fixed32];
         break;
       case GPBUnknownFieldTypeFixed64:
-        [toStr appendFormat:@"%@%d: 0x%llX\n", lineIndent, fieldNumber, field->storage_.intValue];
+        [toStr appendFormat:@"%@%d: 0x%llX\n", lineIndent, fieldNumber, field.fixed64];
         break;
       case GPBUnknownFieldTypeLengthDelimited:
         [toStr appendFormat:@"%@%d: ", lineIndent, fieldNumber];
-        AppendBufferAsString(field->storage_.lengthDelimited, toStr);
+        AppendBufferAsString(field.lengthDelimited, toStr);
         [toStr appendString:@"\n"];
         break;
       case GPBUnknownFieldTypeGroup: {
-        GPBUnknownFields *group = field->storage_.group;
+        GPBUnknownFields *group = field.group;
         if (group.empty) {
           [toStr appendFormat:@"%@%d: {}\n", lineIndent, fieldNumber];
         } else {