Reverts third_party/protobuf: Update to HEAD (f52e188fe4)

third_party/protobuf/objectivec/GPBExtensionRegistry.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 16 matching lines @@
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #import "GPBExtensionRegistry.h"
 
 #import "GPBBootstrap.h"
 #import "GPBDescriptor.h"
 
 @implementation GPBExtensionRegistry {
+  // TODO(dmaclach): Reimplement with CFDictionaries that don't use
+  // objects as keys.
   NSMutableDictionary *mutableClassMap_;
 }
 
 - (instancetype)init {
   if ((self = [super init])) {
     mutableClassMap_ = [[NSMutableDictionary alloc] init];
   }
   return self;
 }
 
 - (void)dealloc {
   [mutableClassMap_ release];
   [super dealloc];
 }
 
-// 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"
-
 - (instancetype)copyWithZone:(NSZone *)zone {
   GPBExtensionRegistry *result = [[[self class] allocWithZone:zone] init];
   if (result && mutableClassMap_.count) {
     [result->mutableClassMap_ addEntriesFromDictionary:mutableClassMap_];
   }
   return result;
 }
 
-- (CFMutableDictionaryRef)extensionMapForContainingMessageClass:
+- (NSMutableDictionary *)extensionMapForContainingMessageClass:
         (Class)containingMessageClass {
-  CFMutableDictionaryRef extensionMap = (CFMutableDictionaryRef)
+  NSMutableDictionary *extensionMap =
       [mutableClassMap_ objectForKey:containingMessageClass];
   if (extensionMap == nil) {
-    // Use a custom dictionary here because the keys are numbers and conversion
-    // back and forth from NSNumber isn't worth the cost.
-    extensionMap = CFDictionaryCreateMutable(kCFAllocatorDefault, 0, NULL,
-                                             &kCFTypeDictionaryValueCallBacks);
-    [mutableClassMap_ setObject:(id)extensionMap
+    extensionMap = [NSMutableDictionary dictionary];
+    [mutableClassMap_ setObject:extensionMap
                          forKey:(id<NSCopying>)containingMessageClass];
   }
   return extensionMap;
 }
 
 - (void)addExtension:(GPBExtensionDescriptor *)extension {
   if (extension == nil) {
     return;
   }
 
   Class containingMessageClass = extension.containingMessageClass;
-  CFMutableDictionaryRef extensionMap =
+  NSMutableDictionary *extensionMap =
       [self extensionMapForContainingMessageClass:containingMessageClass];
-  ssize_t key = extension.fieldNumber;
-  CFDictionarySetValue(extensionMap, (const void *)key, extension);
+  [extensionMap setObject:extension forKey:@(extension.fieldNumber)];
 }
 
 - (GPBExtensionDescriptor *)extensionForDescriptor:(GPBDescriptor *)descriptor
                                        fieldNumber:(NSInteger)fieldNumber {
   Class messageClass = descriptor.messageClass;
-  CFMutableDictionaryRef extensionMap = (CFMutableDictionaryRef)
+  NSDictionary *extensionMap =
       [mutableClassMap_ objectForKey:messageClass];
-  ssize_t key = fieldNumber;
-  GPBExtensionDescriptor *result =
-      (extensionMap
-       ? CFDictionaryGetValue(extensionMap, (const void *)key)
-       : nil);
-  return result;
-}
-
-static void CopyKeyValue(const void *key, const void *value, void *context) {
-  CFMutableDictionaryRef extensionMap = (CFMutableDictionaryRef)context;
-  CFDictionarySetValue(extensionMap, key, value);
+  return [extensionMap objectForKey:@(fieldNumber)];
 }
 
 - (void)addExtensions:(GPBExtensionRegistry *)registry {
   if (registry == nil) {
     // In the case where there are no extensions just ignore.
     return;
   }
   NSMutableDictionary *otherClassMap = registry->mutableClassMap_;
-  [otherClassMap enumerateKeysAndObjectsUsingBlock:^(id key, id value, BOOL * stop) {
-#pragma unused(stop)
-    Class containingMessageClass = key;
-    CFMutableDictionaryRef otherExtensionMap = (CFMutableDictionaryRef)value;
-
-    CFMutableDictionaryRef extensionMap =
+  for (Class containingMessageClass in otherClassMap) {
+    NSMutableDictionary *extensionMap =
         [self extensionMapForContainingMessageClass:containingMessageClass];
-
-    CFDictionaryApplyFunction(otherExtensionMap, CopyKeyValue, extensionMap);
-  }];
+    NSMutableDictionary *otherExtensionMap =
+        [registry extensionMapForContainingMessageClass:containingMessageClass];
+    [extensionMap addEntriesFromDictionary:otherExtensionMap];
+  }
 }
 
-#pragma clang diagnostic pop
-
 @end