Merge pull request #6681 from thomasvl/objc_fix2

Pull the ObjC fixes from #6679 to the 3.10.x branch

objectivec/GPBCodedInputStream.m

@@ -93,14 +93,22 @@ static int8_t ReadRawByte(GPBCodedInputStreamState *state) {
 
 static int32_t ReadRawLittleEndian32(GPBCodedInputStreamState *state) {
   CheckSize(state, sizeof(int32_t));
-  int32_t value = OSReadLittleInt32(state->bytes, state->bufferPos);
+  // Not using OSReadLittleInt32 because it has undocumented dependency
+  // on reads being aligned.
+  int32_t value;
+  memcpy(&value, state->bytes + state->bufferPos, sizeof(int32_t));
+  value = OSSwapLittleToHostInt32(value);
   state->bufferPos += sizeof(int32_t);
   return value;
 }
 
 static int64_t ReadRawLittleEndian64(GPBCodedInputStreamState *state) {
   CheckSize(state, sizeof(int64_t));
-  int64_t value = OSReadLittleInt64(state->bytes, state->bufferPos);
+  // Not using OSReadLittleInt64 because it has undocumented dependency
+  // on reads being aligned.  
+  int64_t value;
+  memcpy(&value, state->bytes + state->bufferPos, sizeof(int64_t));
+  value = OSSwapLittleToHostInt64(value);
   state->bufferPos += sizeof(int64_t);
   return value;
 }

objectivec/GPBUtilities_PackagePrivate.h

@@ -71,27 +71,31 @@ GPB_INLINE void GPBDebugCheckRuntimeVersion() {
 // Conversion functions for de/serializing floating point types.
 
 GPB_INLINE int64_t GPBConvertDoubleToInt64(double v) {
-  union { double f; int64_t i; } u;
+  GPBInternalCompileAssert(sizeof(double) == sizeof(int64_t), double_not_64_bits);
-  u.f = v;
+  int64_t result;
-  return u.i;
+  memcpy(&result, &v, sizeof(result));
+  return result;
 }
 
 GPB_INLINE int32_t GPBConvertFloatToInt32(float v) {
-  union { float f; int32_t i; } u;
+  GPBInternalCompileAssert(sizeof(float) == sizeof(int32_t), float_not_32_bits);
-  u.f = v;
+  int32_t result;
-  return u.i;
+  memcpy(&result, &v, sizeof(result));
+  return result;
 }
 
 GPB_INLINE double GPBConvertInt64ToDouble(int64_t v) {
-  union { double f; int64_t i; } u;
+  GPBInternalCompileAssert(sizeof(double) == sizeof(int64_t), double_not_64_bits);
-  u.i = v;
+  double result;
-  return u.f;
+  memcpy(&result, &v, sizeof(result));
+  return result;
 }
 
 GPB_INLINE float GPBConvertInt32ToFloat(int32_t v) {
-  union { float f; int32_t i; } u;
+  GPBInternalCompileAssert(sizeof(float) == sizeof(int32_t), float_not_32_bits);
-  u.i = v;
+  float result;
-  return u.f;
+  memcpy(&result, &v, sizeof(result));
+  return result;
 }
 
 GPB_INLINE int32_t GPBLogicalRightShift32(int32_t value, int32_t spaces) {