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

third_party/protobuf/objectivec/GPBUtilities_PackagePrivate.h

 // 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 32 matching lines @@
 #define GPBNSStringify(S) @#S
 #define GPBNSStringifySymbol(S) GPBNSStringify(S)
 
 // Constant to internally mark when there is no has bit.
 #define GPBNoHasBit INT32_MAX
 
 CF_EXTERN_C_BEGIN
 
 // These two are used to inject a runtime check for version mismatch into the
 // generated sources to make sure they are linked with a supporting runtime.
-void GPBCheckRuntimeVersionSupport(int32_t objcRuntimeVersion);
-GPB_INLINE void GPB_DEBUG_CHECK_RUNTIME_VERSIONS() {
-  // NOTE: By being inline here, this captures the value from the library's
-  // headers at the time the generated code was compiled.
-#if defined(DEBUG) && DEBUG
-  GPBCheckRuntimeVersionSupport(GOOGLE_PROTOBUF_OBJC_VERSION);
-#endif
-}
-
-// Legacy version of the checks, remove when GOOGLE_PROTOBUF_OBJC_GEN_VERSION
-// goes away (see more info in GPBBootstrap.h).
 void GPBCheckRuntimeVersionInternal(int32_t version);
 GPB_INLINE void GPBDebugCheckRuntimeVersion() {
-#if defined(DEBUG) && DEBUG
+#if DEBUG
   GPBCheckRuntimeVersionInternal(GOOGLE_PROTOBUF_OBJC_GEN_VERSION);
 #endif
 }
 
 // Conversion functions for de/serializing floating point types.
 
 GPB_INLINE int64_t GPBConvertDoubleToInt64(double v) {
   union { double f; int64_t i; } u;
   u.f = v;
   return u.i;
@@ skipping 23 matching lines @@
 
 GPB_INLINE int64_t GPBLogicalRightShift64(int64_t value, int32_t spaces) {
   return (int64_t)((uint64_t)(value) >> spaces);
 }
 
 // Decode a ZigZag-encoded 32-bit value.  ZigZag encodes signed integers
 // into values that can be efficiently encoded with varint.  (Otherwise,
 // negative values must be sign-extended to 64 bits to be varint encoded,
 // thus always taking 10 bytes on the wire.)
 GPB_INLINE int32_t GPBDecodeZigZag32(uint32_t n) {
-  return (int32_t)(GPBLogicalRightShift32((int32_t)n, 1) ^ -((int32_t)(n) & 1));
+  return GPBLogicalRightShift32(n, 1) ^ -(n & 1);
 }
 
 // Decode a ZigZag-encoded 64-bit value.  ZigZag encodes signed integers
 // into values that can be efficiently encoded with varint.  (Otherwise,
 // negative values must be sign-extended to 64 bits to be varint encoded,
 // thus always taking 10 bytes on the wire.)
 GPB_INLINE int64_t GPBDecodeZigZag64(uint64_t n) {
-  return (int64_t)(GPBLogicalRightShift64((int64_t)n, 1) ^ -((int64_t)(n) & 1));
+  return GPBLogicalRightShift64(n, 1) ^ -(n & 1);
 }
 
 // Encode a ZigZag-encoded 32-bit value.  ZigZag encodes signed integers
 // into values that can be efficiently encoded with varint.  (Otherwise,
 // negative values must be sign-extended to 64 bits to be varint encoded,
 // thus always taking 10 bytes on the wire.)
 GPB_INLINE uint32_t GPBEncodeZigZag32(int32_t n) {
   // Note:  the right-shift must be arithmetic
-  return (uint32_t)((n << 1) ^ (n >> 31));
+  return (n << 1) ^ (n >> 31);
 }
 
 // Encode a ZigZag-encoded 64-bit value.  ZigZag encodes signed integers
 // into values that can be efficiently encoded with varint.  (Otherwise,
 // negative values must be sign-extended to 64 bits to be varint encoded,
 // thus always taking 10 bytes on the wire.)
 GPB_INLINE uint64_t GPBEncodeZigZag64(int64_t n) {
   // Note:  the right-shift must be arithmetic
-  return (uint64_t)((n << 1) ^ (n >> 63));
+  return (n << 1) ^ (n >> 63);
 }
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wswitch-enum"
-#pragma clang diagnostic ignored "-Wdirect-ivar-access"
-
 GPB_INLINE BOOL GPBDataTypeIsObject(GPBDataType type) {
   switch (type) {
     case GPBDataTypeBytes:
     case GPBDataTypeString:
     case GPBDataTypeMessage:
     case GPBDataTypeGroup:
       return YES;
     default:
       return NO;
   }
@@ skipping 42 matching lines @@
 }
 GPB_INLINE void GPBSetHasIvarField(GPBMessage *self, GPBFieldDescriptor *field,
                                    BOOL value) {
   GPBMessageFieldDescription *fieldDesc = field->description_;
   GPBSetHasIvar(self, fieldDesc->hasIndex, fieldDesc->number, value);
 }
 
 void GPBMaybeClearOneof(GPBMessage *self, GPBOneofDescriptor *oneof,
                         int32_t oneofHasIndex, uint32_t fieldNumberNotToClear);
 
-#pragma clang diagnostic pop
-
 //%PDDM-DEFINE GPB_IVAR_SET_DECL(NAME, TYPE)
 //%void GPBSet##NAME##IvarWithFieldInternal(GPBMessage *self,
 //%            NAME$S                     GPBFieldDescriptor *field,
 //%            NAME$S                     TYPE value,
 //%            NAME$S                     GPBFileSyntax syntax);
 //%PDDM-EXPAND GPB_IVAR_SET_DECL(Bool, BOOL)
 // This block of code is generated, do not edit it directly.
 
 void GPBSetBoolIvarWithFieldInternal(GPBMessage *self,
                                      GPBFieldDescriptor *field,
@@ skipping 122 matching lines @@
 
 #undef GPB_MESSAGE_SIGNATURE_ENTRY
 
 - (id)getArray;
 - (NSUInteger)getArrayCount;
 - (void)setArray:(NSArray *)array;
 + (id)getClassValue;
 @end
 
 CF_EXTERN_C_END