Revert "third_party/protobuf: Update to HEAD (83d681ee2c)"

third_party/protobuf/objectivec/GPBDescriptor.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 18 matching lines @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #import "GPBDescriptor_PackagePrivate.h"
 
 #import <objc/runtime.h>
 
 #import "GPBUtilities_PackagePrivate.h"
 #import "GPBWireFormat.h"
 #import "GPBMessage_PackagePrivate.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"
-
-// The addresses of these variables are used as keys for objc_getAssociatedObject.
+// The address of this variable is used as a key for obj_getAssociatedObject.
 static const char kTextFormatExtraValueKey = 0;
-static const char kParentClassNameValueKey = 0;
-static const char kClassNameSuffixKey = 0;
 
 // Utility function to generate selectors on the fly.
 static SEL SelFromStrings(const char *prefix, const char *middle,
                           const char *suffix, BOOL takesArg) {
   if (prefix == NULL && suffix == NULL && !takesArg) {
     return sel_getUid(middle);
   }
   const size_t prefixLen = prefix != NULL ? strlen(prefix) : 0;
   const size_t middleLen = strlen(middle);
   const size_t suffixLen = suffix != NULL ? strlen(suffix) : 0;
@@ skipping 151 matching lines @@
       }
     }
   }
 }
 
 - (void)setupExtensionRanges:(const GPBExtensionRange *)ranges count:(int32_t)count {
   extensionRanges_ = ranges;
   extensionRangesCount_ = count;
 }
 
-- (void)setupContainingMessageClassName:(const char *)msgClassName {
-  // Note: Only fetch the class here, can't send messages to it because
-  // that could cause cycles back to this class within +initialize if
-  // two messages have each other in fields (i.e. - they build a graph).
-  NSAssert(objc_getClass(msgClassName), @"Class %s not defined", msgClassName);
-  NSValue *parentNameValue = [NSValue valueWithPointer:msgClassName];
-  objc_setAssociatedObject(self, &kParentClassNameValueKey,
-                           parentNameValue,
-                           OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-}
-
-- (void)setupMessageClassNameSuffix:(NSString *)suffix {
-  if (suffix.length) {
-    objc_setAssociatedObject(self, &kClassNameSuffixKey,
-                             suffix,
-                             OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-  }
-}
-
 - (NSString *)name {
   return NSStringFromClass(messageClass_);
 }
 
-- (GPBDescriptor *)containingType {
-  NSValue *parentNameValue =
-      objc_getAssociatedObject(self, &kParentClassNameValueKey);
-  if (!parentNameValue) {
-    return nil;
-  }
-  const char *parentName = [parentNameValue pointerValue];
-  Class parentClass = objc_getClass(parentName);
-  NSAssert(parentClass, @"Class %s not defined", parentName);
-  return [parentClass descriptor];
-}
-
-- (NSString *)fullName {
-  NSString *className = NSStringFromClass(self.messageClass);
-  GPBFileDescriptor *file = self.file;
-  NSString *objcPrefix = file.objcPrefix;
-  if (objcPrefix && ![className hasPrefix:objcPrefix]) {
-    NSAssert(0,
-             @"Class didn't have correct prefix? (%@ - %@)",
-             className, objcPrefix);
-    return nil;
-  }
-  GPBDescriptor *parent = self.containingType;
-
-  NSString *name = nil;
-  if (parent) {
-    NSString *parentClassName = NSStringFromClass(parent.messageClass);
-    // The generator will add _Class to avoid reserved words, drop it.
-    NSString *suffix = objc_getAssociatedObject(parent, &kClassNameSuffixKey);
-    if (suffix) {
-      if (![parentClassName hasSuffix:suffix]) {
-        NSAssert(0,
-                 @"ParentMessage class didn't have correct suffix? (%@ - %@)",
-                 className, suffix);
-        return nil;
-      }
-      parentClassName =
-          [parentClassName substringToIndex:(parentClassName.length - suffix.length)];
-    }
-    NSString *parentPrefix = [parentClassName stringByAppendingString:@"_"];
-    if (![className hasPrefix:parentPrefix]) {
-      NSAssert(0,
-               @"Class didn't have the correct parent name prefix? (%@ - %@)",
-               parentPrefix, className);
-      return nil;
-    }
-    name = [className substringFromIndex:parentPrefix.length];
-  } else {
-    name = [className substringFromIndex:objcPrefix.length];
-  }
-
-  // The generator will add _Class to avoid reserved words, drop it.
-  NSString *suffix = objc_getAssociatedObject(self, &kClassNameSuffixKey);
-  if (suffix) {
-    if (![name hasSuffix:suffix]) {
-      NSAssert(0,
-               @"Message class didn't have correct suffix? (%@ - %@)",
-               name, suffix);
-      return nil;
-    }
-    name = [name substringToIndex:(name.length - suffix.length)];
-  }
-
-  NSString *prefix = (parent != nil ? parent.fullName : file.package);
-  NSString *result;
-  if (prefix.length > 0) {
-    result = [NSString stringWithFormat:@"%@.%@", prefix, name];
-  } else {
-    result = name;
-  }
-  return result;
-}
-
 - (id)copyWithZone:(NSZone *)zone {
 #pragma unused(zone)
   return [self retain];
 }
 
 - (GPBFieldDescriptor *)fieldWithNumber:(uint32_t)fieldNumber {
   for (GPBFieldDescriptor *descriptor in fields_) {
     if (GPBFieldNumber(descriptor) == fieldNumber) {
       return descriptor;
     }
@@ skipping 16 matching lines @@
       return descriptor;
     }
   }
   return nil;
 }
 
 @end
 
 @implementation GPBFileDescriptor {
   NSString *package_;
-  NSString *objcPrefix_;
   GPBFileSyntax syntax_;
 }
 
 @synthesize package = package_;
-@synthesize objcPrefix = objcPrefix_;
 @synthesize syntax = syntax_;
 
 - (instancetype)initWithPackage:(NSString *)package
-                     objcPrefix:(NSString *)objcPrefix
-                         syntax:(GPBFileSyntax)syntax {
-  self = [super init];
-  if (self) {
-    package_ = [package copy];
-    objcPrefix_ = [objcPrefix copy];
-    syntax_ = syntax;
-  }
-  return self;
-}
-
-- (instancetype)initWithPackage:(NSString *)package
                          syntax:(GPBFileSyntax)syntax {
   self = [super init];
   if (self) {
     package_ = [package copy];
     syntax_ = syntax;
   }
   return self;
 }
 
-- (void)dealloc {
-  [package_ release];
-  [objcPrefix_ release];
-  [super dealloc];
-}
-
 @end
 
 @implementation GPBOneofDescriptor
 
 @synthesize fields = fields_;
 
 - (instancetype)initWithName:(const char *)name fields:(NSArray *)fields {
   self = [super init];
   if (self) {
     name_ = name;
@@ skipping 120 matching lines @@
           (coreDesc->hasIndex != GPBNoHasBit) &&
           ((syntax != GPBFileSyntaxProto3) || isMessage)) {
         hasOrCountSel_ = SelFromStrings("has", coreDesc->name, NULL, NO);
         setHasSel_ = SelFromStrings("setHas", coreDesc->name, NULL, YES);
       }
     }
 
     // Extra type specific data.
     if (isMessage) {
       const char *className = coreDesc->dataTypeSpecific.className;
-      // Note: Only fetch the class here, can't send messages to it because
-      // that could cause cycles back to this class within +initialize if
-      // two messages have each other in fields (i.e. - they build a graph).
       msgClass_ = objc_getClass(className);
       NSAssert(msgClass_, @"Class %s not defined", className);
     } else if (dataType == GPBDataTypeEnum) {
       if ((coreDesc->flags & GPBFieldHasEnumDescriptor) != 0) {
         enumHandling_.enumDescriptor_ =
             coreDesc->dataTypeSpecific.enumDescFunc();
       } else {
         enumHandling_.enumVerifier_ =
             coreDesc->dataTypeSpecific.enumVerifier;
       }
@@ skipping 320 matching lines @@
     if (strcmp(nameAsCStr, valueName) == 0) {
       if (outValue) {
         *outValue = values_[i];
       }
       return YES;
     }
   }
   return NO;
 }
 
-- (BOOL)getValue:(int32_t *)outValue forEnumTextFormatName:(NSString *)textFormatName {
-    if (nameOffsets_ == NULL) [self calcValueNameOffsets];
-
-    for (uint32_t i = 0; i < valueCount_; ++i) {
-        int32_t value = values_[i];
-        NSString *valueTextFormatName = [self textFormatNameForValue:value];
-        if ([valueTextFormatName isEqual:textFormatName]) {
-            if (outValue) {
-                *outValue = value;
-            }
-            return YES;
-        }
-    }
-    return NO;
-}
-
 - (NSString *)textFormatNameForValue:(int32_t)number {
   if (nameOffsets_ == NULL) [self calcValueNameOffsets];
 
   // Find the EnumValue descriptor and its index.
   BOOL foundIt = NO;
   uint32_t valueDescriptorIndex;
   for (valueDescriptorIndex = 0; valueDescriptorIndex < valueCount_;
        ++valueDescriptorIndex) {
     if (values_[valueDescriptorIndex] == number) {
       foundIt = YES;
@@ skipping 38 matching lines @@
   GPBGenericValue defaultValue_;
 }
 
 @synthesize containingMessageClass = containingMessageClass_;
 
 - (instancetype)initWithExtensionDescription:
         (GPBExtensionDescription *)description {
   if ((self = [super init])) {
     description_ = description;
 
-#if defined(DEBUG) && DEBUG
+#if DEBUG
     const char *className = description->messageOrGroupClassName;
     if (className) {
       NSAssert(objc_lookUpClass(className) != Nil,
                @"Class %s not defined", className);
     }
 #endif
 
     if (description->extendedClass) {
       Class containingClass = objc_lookUpClass(description->extendedClass);
       NSAssert(containingClass, @"Class %s not defined",
@@ skipping 137 matching lines @@
   if (selfNumber < otherNumber) {
     return NSOrderedAscending;
   } else if (selfNumber == otherNumber) {
     return NSOrderedSame;
   } else {
     return NSOrderedDescending;
   }
 }
 
 @end
-
-#pragma clang diagnostic pop