commit e9b0c9265984bec7c7bce69dc6ac2dbd015a62f9
author Thomas Van Lenten <thomasvl@google.com> Mon Apr 06 16:17:55 2020 -0400
committer Thomas Van Lenten <thomasvl@google.com> Fri Apr 24 16:36:15 2020 -0400
tree e7e3a4871bbfb608bd59c310ca66ce9d55af84c9
parent 59f8dd5fafe44cb2aee5dd352361b3a540880a1c

[ObjC] Update oneof generation for proto3 optional.

- Don't make an OneofGenerator for synthetic oneofs.
- Update the field calculations that determine if hasbits are needed to
  know about synthetic oneofs and ignore them.

objectivec/GPBStruct.pbobjc.m

diff --git a/objectivec/GPBStruct.pbobjc.m b/objectivec/GPBStruct.pbobjc.m
index dbdcbe1..b43e9cd 100644
--- a/objectivec/GPBStruct.pbobjc.m
+++ b/objectivec/GPBStruct.pbobjc.m
@@ -256,7 +256,7 @@
 }
 
 void GPBValue_ClearKindOneOfCase(GPBValue *message) {
-  GPBDescriptor *descriptor = [message descriptor];
+  GPBDescriptor *descriptor = [GPBValue descriptor];
   GPBOneofDescriptor *oneof = [descriptor.oneofs objectAtIndex:0];
   GPBMaybeClearOneof(message, oneof, -1, 0);
 }