Reverts third_party/protobuf: Update to HEAD (f52e188fe4)

third_party/protobuf/objectivec/GPBUtilities.m

 // Protocol Buffers - Google's data interchange format
 // Copyright 2008 Google Inc.  All rights reserved.
 // https://developers.google.com/protocol-buffers/
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
@@ skipping 21 matching lines @@
 
 #import <objc/runtime.h>
 
 #import "GPBArray_PackagePrivate.h"
 #import "GPBDescriptor_PackagePrivate.h"
 #import "GPBDictionary_PackagePrivate.h"
 #import "GPBMessage_PackagePrivate.h"
 #import "GPBUnknownField.h"
 #import "GPBUnknownFieldSet.h"
 
-// Direct access is use for speed, to avoid even internally declaring things
-// read/write, etc. The warning is enabled in the project to ensure code calling
-// protos can turn on -Wdirect-ivar-access without issues.
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdirect-ivar-access"
-
 static void AppendTextFormatForMessage(GPBMessage *message,
                                        NSMutableString *toStr,
                                        NSString *lineIndent);
 
 NSData *GPBEmptyNSData(void) {
   static dispatch_once_t onceToken;
   static NSData *defaultNSData = nil;
   dispatch_once(&onceToken, ^{
     defaultNSData = [[NSData alloc] init];
   });
   return defaultNSData;
 }
 
-// -- About Version Checks --
-// There's actually 3 places these checks all come into play:
-// 1. When the generated source is compile into .o files, the header check
-//    happens. This is checking the protoc used matches the library being used
-//    when making the .o.
-// 2. Every place a generated proto header is included in a developer's code,
-//    the header check comes into play again. But this time it is checking that
-//    the current library headers being used still support/match the ones for
-//    the generated code.
-// 3. At runtime the final check here (GPBCheckRuntimeVersionsInternal), is
-//    called from the generated code passing in values captured when the
-//    generated code's .o was made. This checks that at runtime the generated
-//    code and runtime library match.
-
-void GPBCheckRuntimeVersionSupport(int32_t objcRuntimeVersion) {
-  // NOTE: This is passing the value captured in the compiled code to check
-  // against the values captured when the runtime support was compiled. This
-  // ensures the library code isn't in a different framework/library that
-  // was generated with a non matching version.
-  if (GOOGLE_PROTOBUF_OBJC_VERSION < objcRuntimeVersion) {
-    // Library is too old for headers.
-    [NSException raise:NSInternalInconsistencyException
-                format:@"Linked to ProtocolBuffer runtime version %d,"
-                       @" but code compiled needing atleast %d!",
-                       GOOGLE_PROTOBUF_OBJC_VERSION, objcRuntimeVersion];
-  }
-  if (objcRuntimeVersion < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION) {
-    // Headers are too old for library.
-    [NSException raise:NSInternalInconsistencyException
-                format:@"Proto generation source compiled against runtime"
-                       @" version %d, but this version of the runtime only"
-                       @" supports back to %d!",
-                       objcRuntimeVersion,
-                       GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION];
-  }
-}
-
-// This api is no longer used for version checks. 30001 is the last version
-// using this old versioning model. When that support is removed, this function
-// can be removed (along with the declaration in GPBUtilities_PackagePrivate.h).
 void GPBCheckRuntimeVersionInternal(int32_t version) {
-  GPBInternalCompileAssert(GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION == 30001,
-                           time_to_remove_this_old_version_shim);
-  if (version != GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION) {
+  if (version != GOOGLE_PROTOBUF_OBJC_GEN_VERSION) {
     [NSException raise:NSInternalInconsistencyException
                 format:@"Linked to ProtocolBuffer runtime version %d,"
                        @" but code compiled with version %d!",
                        GOOGLE_PROTOBUF_OBJC_GEN_VERSION, version];
   }
 }
 
 BOOL GPBMessageHasFieldNumberSet(GPBMessage *self, uint32_t fieldNumber) {
   GPBDescriptor *descriptor = [self descriptor];
   GPBFieldDescriptor *field = [descriptor fieldWithNumber:fieldNumber];
@@ skipping 138 matching lines @@
 //%  NSCAssert(self->messageStorage_ != NULL,
 //%            @"%@: All messages should have storage (from init)",
 //%            [self class]);
 //%#if defined(__clang_analyzer__)
 //%  if (self->messageStorage_ == NULL) return;
 //%#endif
 //%  uint8_t *storage = (uint8_t *)self->messageStorage_;
 //%  TYPE *typePtr = (TYPE *)&storage[field->description_->offset];
 //%  *typePtr = value;
 //%  // proto2: any value counts as having been set; proto3, it
-//%  // has to be a non zero value or be in a oneof.
-//%  BOOL hasValue = ((syntax == GPBFileSyntaxProto2)
-//%                   || (value != (TYPE)0)
-//%                   || (field->containingOneof_ != NULL));
+//%  // has to be a non zero value.
+//%  BOOL hasValue =
+//%    (syntax == GPBFileSyntaxProto2) || (value != (TYPE)0);
 //%  GPBSetHasIvarField(self, field, hasValue);
 //%  GPBBecomeVisibleToAutocreator(self);
 //%}
 //%
 //%PDDM-DEFINE IVAR_ALIAS_DEFN_OBJECT(NAME, TYPE)
 //%// Only exists for public api, no core code should use this.
 //%TYPE *GPBGetMessage##NAME##Field(GPBMessage *self,
 //% TYPE$S             NAME$S       GPBFieldDescriptor *field) {
 //%  return (TYPE *)GPBGetObjectIvarWithField(self, field);
 //%}
@@ skipping 96 matching lines @@
       GPBMessageFieldDescription *fieldDesc = field->description_;
       GPBMaybeClearOneof(self, oneof, fieldDesc->hasIndex, fieldDesc->number);
     }
     // Clear "has" if they are being set to nil.
     BOOL setHasValue = (value != nil);
     // Under proto3, Bytes & String fields get cleared by resetting them to
     // their default (empty) values, so if they are set to something of length
     // zero, they are being cleared.
     if ((syntax == GPBFileSyntaxProto3) && !fieldIsMessage &&
         ([value length] == 0)) {
-      // Except, if the field was in a oneof, then it still gets recorded as
-      // having been set so the state of the oneof can be serialized back out.
-      if (!oneof) {
-        setHasValue = NO;
-      }
-      if (setHasValue) {
-        NSCAssert(value != nil, @"Should never be setting has for nil");
-      } else {
-        // The value passed in was retained, it must be released since we
-        // aren't saving anything in the field.
-        [value release];
-        value = nil;
-      }
+      setHasValue = NO;
+      value = nil;
     }
     GPBSetHasIvarField(self, field, setHasValue);
   }
   uint8_t *storage = (uint8_t *)self->messageStorage_;
   id *typePtr = (id *)&storage[field->description_->offset];
 
   id oldValue = *typePtr;
 
   *typePtr = value;
 
@@ skipping 165 matching lines @@
     GPBMaybeClearOneof(self, oneof, fieldDesc->hasIndex, fieldDesc->number);
   }
 
   // Bools are stored in the has bits to avoid needing explicit space in the
   // storage structure.
   // (the field number passed to the HasIvar helper doesn't really matter since
   // the offset is never negative)
   GPBSetHasIvar(self, (int32_t)(fieldDesc->offset), fieldDesc->number, value);
 
   // proto2: any value counts as having been set; proto3, it
-  // has to be a non zero value or be in a oneof.
-  BOOL hasValue = ((syntax == GPBFileSyntaxProto2)
-                   || (value != (BOOL)0)
-                   || (field->containingOneof_ != NULL));
+  // has to be a non zero value.
+  BOOL hasValue =
+    (syntax == GPBFileSyntaxProto2) || (value != (BOOL)0);
   GPBSetHasIvarField(self, field, hasValue);
   GPBBecomeVisibleToAutocreator(self);
 }
 
 //%PDDM-EXPAND IVAR_POD_ACCESSORS_DEFN(Int32, int32_t)
 // This block of code is generated, do not edit it directly.
 
 int32_t GPBGetMessageInt32Field(GPBMessage *self,
                                 GPBFieldDescriptor *field) {
   if (GPBGetHasIvarField(self, field)) {
@@ skipping 26 matching lines @@
   NSCAssert(self->messageStorage_ != NULL,
             @"%@: All messages should have storage (from init)",
             [self class]);
 #if defined(__clang_analyzer__)
   if (self->messageStorage_ == NULL) return;
 #endif
   uint8_t *storage = (uint8_t *)self->messageStorage_;
   int32_t *typePtr = (int32_t *)&storage[field->description_->offset];
   *typePtr = value;
   // proto2: any value counts as having been set; proto3, it
-  // has to be a non zero value or be in a oneof.
-  BOOL hasValue = ((syntax == GPBFileSyntaxProto2)
-                   || (value != (int32_t)0)
-                   || (field->containingOneof_ != NULL));
+  // has to be a non zero value.
+  BOOL hasValue =
+    (syntax == GPBFileSyntaxProto2) || (value != (int32_t)0);
   GPBSetHasIvarField(self, field, hasValue);
   GPBBecomeVisibleToAutocreator(self);
 }
 
 //%PDDM-EXPAND IVAR_POD_ACCESSORS_DEFN(UInt32, uint32_t)
 // This block of code is generated, do not edit it directly.
 
 uint32_t GPBGetMessageUInt32Field(GPBMessage *self,
                                   GPBFieldDescriptor *field) {
   if (GPBGetHasIvarField(self, field)) {
@@ skipping 26 matching lines @@
   NSCAssert(self->messageStorage_ != NULL,
             @"%@: All messages should have storage (from init)",
             [self class]);
 #if defined(__clang_analyzer__)
   if (self->messageStorage_ == NULL) return;
 #endif
   uint8_t *storage = (uint8_t *)self->messageStorage_;
   uint32_t *typePtr = (uint32_t *)&storage[field->description_->offset];
   *typePtr = value;
   // proto2: any value counts as having been set; proto3, it
-  // has to be a non zero value or be in a oneof.
-  BOOL hasValue = ((syntax == GPBFileSyntaxProto2)
-                   || (value != (uint32_t)0)
-                   || (field->containingOneof_ != NULL));
+  // has to be a non zero value.
+  BOOL hasValue =
+    (syntax == GPBFileSyntaxProto2) || (value != (uint32_t)0);
   GPBSetHasIvarField(self, field, hasValue);
   GPBBecomeVisibleToAutocreator(self);
 }
 
 //%PDDM-EXPAND IVAR_POD_ACCESSORS_DEFN(Int64, int64_t)
 // This block of code is generated, do not edit it directly.
 
 int64_t GPBGetMessageInt64Field(GPBMessage *self,
                                 GPBFieldDescriptor *field) {
   if (GPBGetHasIvarField(self, field)) {
@@ skipping 26 matching lines @@
   NSCAssert(self->messageStorage_ != NULL,
             @"%@: All messages should have storage (from init)",
             [self class]);
 #if defined(__clang_analyzer__)
   if (self->messageStorage_ == NULL) return;
 #endif
   uint8_t *storage = (uint8_t *)self->messageStorage_;
   int64_t *typePtr = (int64_t *)&storage[field->description_->offset];
   *typePtr = value;
   // proto2: any value counts as having been set; proto3, it
-  // has to be a non zero value or be in a oneof.
-  BOOL hasValue = ((syntax == GPBFileSyntaxProto2)
-                   || (value != (int64_t)0)
-                   || (field->containingOneof_ != NULL));
+  // has to be a non zero value.
+  BOOL hasValue =
+    (syntax == GPBFileSyntaxProto2) || (value != (int64_t)0);
   GPBSetHasIvarField(self, field, hasValue);
   GPBBecomeVisibleToAutocreator(self);
 }
 
 //%PDDM-EXPAND IVAR_POD_ACCESSORS_DEFN(UInt64, uint64_t)
 // This block of code is generated, do not edit it directly.
 
 uint64_t GPBGetMessageUInt64Field(GPBMessage *self,
                                   GPBFieldDescriptor *field) {
   if (GPBGetHasIvarField(self, field)) {
@@ skipping 26 matching lines @@
   NSCAssert(self->messageStorage_ != NULL,
             @"%@: All messages should have storage (from init)",
             [self class]);
 #if defined(__clang_analyzer__)
   if (self->messageStorage_ == NULL) return;
 #endif
   uint8_t *storage = (uint8_t *)self->messageStorage_;
   uint64_t *typePtr = (uint64_t *)&storage[field->description_->offset];
   *typePtr = value;
   // proto2: any value counts as having been set; proto3, it
-  // has to be a non zero value or be in a oneof.
-  BOOL hasValue = ((syntax == GPBFileSyntaxProto2)
-                   || (value != (uint64_t)0)
-                   || (field->containingOneof_ != NULL));
+  // has to be a non zero value.
+  BOOL hasValue =
+    (syntax == GPBFileSyntaxProto2) || (value != (uint64_t)0);
   GPBSetHasIvarField(self, field, hasValue);
   GPBBecomeVisibleToAutocreator(self);
 }
 
 //%PDDM-EXPAND IVAR_POD_ACCESSORS_DEFN(Float, float)
 // This block of code is generated, do not edit it directly.
 
 float GPBGetMessageFloatField(GPBMessage *self,
                               GPBFieldDescriptor *field) {
   if (GPBGetHasIvarField(self, field)) {
@@ skipping 26 matching lines @@
   NSCAssert(self->messageStorage_ != NULL,
             @"%@: All messages should have storage (from init)",
             [self class]);
 #if defined(__clang_analyzer__)
   if (self->messageStorage_ == NULL) return;
 #endif
   uint8_t *storage = (uint8_t *)self->messageStorage_;
   float *typePtr = (float *)&storage[field->description_->offset];
   *typePtr = value;
   // proto2: any value counts as having been set; proto3, it
-  // has to be a non zero value or be in a oneof.
-  BOOL hasValue = ((syntax == GPBFileSyntaxProto2)
-                   || (value != (float)0)
-                   || (field->containingOneof_ != NULL));
+  // has to be a non zero value.
+  BOOL hasValue =
+    (syntax == GPBFileSyntaxProto2) || (value != (float)0);
   GPBSetHasIvarField(self, field, hasValue);
   GPBBecomeVisibleToAutocreator(self);
 }
 
 //%PDDM-EXPAND IVAR_POD_ACCESSORS_DEFN(Double, double)
 // This block of code is generated, do not edit it directly.
 
 double GPBGetMessageDoubleField(GPBMessage *self,
                                 GPBFieldDescriptor *field) {
   if (GPBGetHasIvarField(self, field)) {
@@ skipping 26 matching lines @@
   NSCAssert(self->messageStorage_ != NULL,
             @"%@: All messages should have storage (from init)",
             [self class]);
 #if defined(__clang_analyzer__)
   if (self->messageStorage_ == NULL) return;
 #endif
   uint8_t *storage = (uint8_t *)self->messageStorage_;
   double *typePtr = (double *)&storage[field->description_->offset];
   *typePtr = value;
   // proto2: any value counts as having been set; proto3, it
-  // has to be a non zero value or be in a oneof.
-  BOOL hasValue = ((syntax == GPBFileSyntaxProto2)
-                   || (value != (double)0)
-                   || (field->containingOneof_ != NULL));
+  // has to be a non zero value.
+  BOOL hasValue =
+    (syntax == GPBFileSyntaxProto2) || (value != (double)0);
   GPBSetHasIvarField(self, field, hasValue);
   GPBBecomeVisibleToAutocreator(self);
 }
 
 //%PDDM-EXPAND-END (6 expansions)
 
 // Aliases are function calls that are virtually the same.
 
 //%PDDM-EXPAND IVAR_ALIAS_DEFN_OBJECT(String, NSString)
 // This block of code is generated, do not edit it directly.
@@ skipping 54 matching lines @@
 
 // Only exists for public api, no core code should use this.
 void GPBSetMessageGroupField(GPBMessage *self,
                              GPBFieldDescriptor *field,
                              GPBMessage *value) {
   GPBSetObjectIvarWithField(self, field, (id)value);
 }
 
 //%PDDM-EXPAND-END (4 expansions)
 
-// GPBGetMessageRepeatedField is defined in GPBMessage.m
+// Only exists for public api, no core code should use this.
+id GPBGetMessageRepeatedField(GPBMessage *self, GPBFieldDescriptor *field) {
+#if DEBUG
+  if (field.fieldType != GPBFieldTypeRepeated) {
+    [NSException raise:NSInvalidArgumentException
+                format:@"%@.%@ is not a repeated field.",
+                       [self class], field.name];
+  }
+#endif
+  return GPBGetObjectIvarWithField(self, field);
+}
 
 // Only exists for public api, no core code should use this.
 void GPBSetMessageRepeatedField(GPBMessage *self, GPBFieldDescriptor *field, id array) {
-#if defined(DEBUG) && DEBUG
+#if DEBUG
   if (field.fieldType != GPBFieldTypeRepeated) {
     [NSException raise:NSInvalidArgumentException
                 format:@"%@.%@ is not a repeated field.",
                        [self class], field.name];
   }
   Class expectedClass = Nil;
   switch (GPBGetFieldDataType(field)) {
     case GPBDataTypeBool:
       expectedClass = [GPBBoolArray class];
       break;
@@ skipping 18 matching lines @@
     case GPBDataTypeFloat:
       expectedClass = [GPBFloatArray class];
       break;
     case GPBDataTypeDouble:
       expectedClass = [GPBDoubleArray class];
       break;
     case GPBDataTypeBytes:
     case GPBDataTypeString:
     case GPBDataTypeMessage:
     case GPBDataTypeGroup:
-      expectedClass = [NSMutableArray class];
+      expectedClass = [NSMutableDictionary class];
       break;
     case GPBDataTypeEnum:
-      expectedClass = [GPBEnumArray class];
+      expectedClass = [GPBBoolArray class];
       break;
   }
   if (array && ![array isKindOfClass:expectedClass]) {
     [NSException raise:NSInvalidArgumentException
                 format:@"%@.%@: Expected %@ object, got %@.",
                        [self class], field.name, expectedClass, [array class]];
   }
 #endif
   GPBSetObjectIvarWithField(self, field, array);
 }
 
-#if defined(DEBUG) && DEBUG
+#if DEBUG
 static NSString *TypeToStr(GPBDataType dataType) {
   switch (dataType) {
     case GPBDataTypeBool:
       return @"Bool";
     case GPBDataTypeSFixed32:
     case GPBDataTypeInt32:
     case GPBDataTypeSInt32:
       return @"Int32";
     case GPBDataTypeFixed32:
     case GPBDataTypeUInt32:
@@ skipping 13 matching lines @@
     case GPBDataTypeString:
     case GPBDataTypeMessage:
     case GPBDataTypeGroup:
       return @"Object";
     case GPBDataTypeEnum:
       return @"Bool";
   }
 }
 #endif
 
-// GPBGetMessageMapField is defined in GPBMessage.m
+// Only exists for public api, no core code should use this.
+id GPBGetMessageMapField(GPBMessage *self, GPBFieldDescriptor *field) {
+#if DEBUG
+  if (field.fieldType != GPBFieldTypeMap) {
+    [NSException raise:NSInvalidArgumentException
+                format:@"%@.%@ is not a map<> field.",
+                       [self class], field.name];
+  }
+#endif
+  return GPBGetObjectIvarWithField(self, field);
+}
 
 // Only exists for public api, no core code should use this.
 void GPBSetMessageMapField(GPBMessage *self, GPBFieldDescriptor *field,
                            id dictionary) {
-#if defined(DEBUG) && DEBUG
+#if DEBUG
   if (field.fieldType != GPBFieldTypeMap) {
     [NSException raise:NSInvalidArgumentException
                 format:@"%@.%@ is not a map<> field.",
                        [self class], field.name];
   }
   if (dictionary) {
     GPBDataType keyDataType = field.mapKeyDataType;
     GPBDataType valueDataType = GPBGetFieldDataType(field);
     NSString *keyStr = TypeToStr(keyDataType);
     NSString *valueStr = TypeToStr(valueDataType);
@@ skipping 39 matching lines @@
   for (NSUInteger i = 0; i < len; ++i) {
     unichar aChar = [toPrint characterAtIndex:i];
     switch (aChar) {
       case '\n': [destStr appendString:@"\\n"];  break;
       case '\r': [destStr appendString:@"\\r"];  break;
       case '\t': [destStr appendString:@"\\t"];  break;
       case '\"': [destStr appendString:@"\\\""]; break;
       case '\'': [destStr appendString:@"\\\'"]; break;
       case '\\': [destStr appendString:@"\\\\"]; break;
       default:
-        // This differs slightly from the C++ code in that the C++ doesn't
-        // generate UTF8; it looks at the string in UTF8, but escapes every
-        // byte > 0x7E.
-        if (aChar < 0x20) {
-          [destStr appendFormat:@"\\%d%d%d",
-                                (aChar / 64), ((aChar % 64) / 8), (aChar % 8)];
-        } else {
-          [destStr appendFormat:@"%C", aChar];
-        }
+        [destStr appendFormat:@"%C", aChar];
         break;
     }
   }
   [destStr appendString:@"\""];
 }
 
 static void AppendBufferAsString(NSData *buffer, NSMutableString *destStr) {
   const char *src = (const char *)[buffer bytes];
   size_t srcLen = [buffer length];
   [destStr appendString:@"\""];
@@ skipping 46 matching lines @@
     [dict enumerateKeysAndObjectsUsingBlock:^(NSString *key, id value, BOOL *stop) {
       #pragma unused(stop)
       [toStr appendString:(isFirst ? msgStartFirst : msgStart)];
       isFirst = NO;
 
       [toStr appendString:keyLine];
       AppendStringEscaped(key, toStr);
       [toStr appendString:@"\n"];
 
       [toStr appendString:valueLine];
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wswitch-enum"
       switch (valueDataType) {
         case GPBDataTypeString:
           AppendStringEscaped(value, toStr);
           break;
 
         case GPBDataTypeBytes:
           AppendBufferAsString(value, toStr);
           break;
 
         case GPBDataTypeMessage:
           [toStr appendString:@"{\n"];
           NSString *subIndent = [lineIndent stringByAppendingString:@"    "];
           AppendTextFormatForMessage(value, toStr, subIndent);
           [toStr appendFormat:@"%@  }", lineIndent];
           break;
 
         default:
           NSCAssert(NO, @"Can't happen");
           break;
       }
-#pragma clang diagnostic pop
       [toStr appendString:@"\n"];
 
       [toStr appendString:msgEnd];
     }];
   } else {
     // map is one of the GPB*Dictionary classes, type doesn't matter.
     GPBInt32Int32Dictionary *dict = map;
     [dict enumerateForTextFormat:^(id keyObj, id valueObj) {
       [toStr appendString:(isFirst ? msgStartFirst : msgStart)];
       isFirst = NO;
 
       // Key always is a NSString.
       if (keyDataType == GPBDataTypeString) {
         [toStr appendString:keyLine];
         AppendStringEscaped(keyObj, toStr);
         [toStr appendString:@"\n"];
       } else {
         [toStr appendFormat:@"%@%@\n", keyLine, keyObj];
       }
 
       [toStr appendString:valueLine];
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wswitch-enum"
       switch (valueDataType) {
         case GPBDataTypeString:
           AppendStringEscaped(valueObj, toStr);
           break;
 
         case GPBDataTypeBytes:
           AppendBufferAsString(valueObj, toStr);
           break;
 
         case GPBDataTypeMessage:
@@ skipping 17 matching lines @@
           }
           break;
         }
 
         default:
           NSCAssert(valueDataType != GPBDataTypeGroup, @"Can't happen");
           // Everything else is a NSString.
           [toStr appendString:valueObj];
           break;
       }
-#pragma clang diagnostic pop
       [toStr appendString:@"\n"];
 
       [toStr appendString:msgEnd];
     }];
   }
 }
 
 static void AppendTextFormatForMessageField(GPBMessage *message,
                                             GPBFieldDescriptor *field,
                                             NSMutableString *toStr,
@@ skipping 249 matching lines @@
 }
 
 static void AppendTextFormatForMessage(GPBMessage *message,
                                        NSMutableString *toStr,
                                        NSString *lineIndent) {
   GPBDescriptor *descriptor = [message descriptor];
   NSArray *fieldsArray = descriptor->fields_;
   NSUInteger fieldCount = fieldsArray.count;
   const GPBExtensionRange *extensionRanges = descriptor.extensionRanges;
   NSUInteger extensionRangesCount = descriptor.extensionRangesCount;
-  NSArray *activeExtensions = [[message extensionsCurrentlySet]
-      sortedArrayUsingSelector:@selector(compareByFieldNumber:)];
+  NSArray *activeExtensions = [message sortedExtensionsInUse];
   for (NSUInteger i = 0, j = 0; i < fieldCount || j < extensionRangesCount;) {
     if (i == fieldCount) {
       AppendTextFormatForMessageExtensionRange(
           message, activeExtensions, extensionRanges[j++], toStr, lineIndent);
     } else if (j == extensionRangesCount ||
                GPBFieldNumber(fieldsArray[i]) < extensionRanges[j].start) {
       AppendTextFormatForMessageField(message, fieldsArray[i++], toStr,
                                       lineIndent);
     } else {
       AppendTextFormatForMessageExtensionRange(
@@ skipping 205 matching lines @@
       } else {
         [result appendFormat:@"%C", c];
       }
     }
     i += segmentLen;
   }
 
   return result;
 }
 
-#pragma clang diagnostic pop
-
 #pragma mark - GPBMessageSignatureProtocol
 
 // A series of selectors that are used solely to get @encoding values
 // for them by the dynamic protobuf runtime code. An object using the protocol
 // needs to be declared for the protocol to be valid at runtime.
 @interface GPBMessageSignatureProtocol : NSObject<GPBMessageSignatureProtocol>
 @end
 @implementation GPBMessageSignatureProtocol
 @end