Emit hassers for oneofs in objectivec.

This conforms to our other implementations which emit hassers for oneofs and already do track presence.

PiperOrigin-RevId: 816837388

Author: mkruskal-google

objectivec/GPBMessage.m

@@ -3475,10 +3475,8 @@ GPB_INLINE BOOL GPBIsSetSelForField(const char *selName, size_t selNameLength,
 
 GPB_INLINE BOOL GPBFieldHasHas(GPBFieldDescriptor *descriptor) {
   // It gets has/setHas selectors if...
-  //  - not in a oneof (negative has index)
   //  - not clearing on zero
-  return (descriptor->description_->hasIndex >= 0) &&
-         ((descriptor->description_->flags & GPBFieldClearHasIvarOnZero) == 0);
+  return ((descriptor->description_->flags & GPBFieldClearHasIvarOnZero) == 0);
 }
 
 GPB_INLINE BOOL GPBIsHasSelForField(const char *selName, size_t selNameLength,

objectivec/Tests/GPBMessageTests+Runtime.m

@@ -95,14 +95,14 @@ - (void)testProto2HasMethodSupport {
     XCTAssertTrue([Message2 instancesRespondToSelector:countSel], @"field: %@", name);
   }
 
-  // OneOf fields - no has*/setHas*
+  // OneOf fields - has*/setHas* is valid.
 
   for (NSString *name in names) {
     // build the selector, i.e. - hasOneofInt32/setHasOneofInt32:
     SEL hasSel = NSSelectorFromString([NSString stringWithFormat:@"hasOneof%@", name]);
     SEL setHasSel = NSSelectorFromString([NSString stringWithFormat:@"setHasOneof%@:", name]);
-    XCTAssertFalse([Message2 instancesRespondToSelector:hasSel], @"field: %@", name);
-    XCTAssertFalse([Message2 instancesRespondToSelector:setHasSel], @"field: %@", name);
+    XCTAssertTrue([Message2 instancesRespondToSelector:hasSel], @"field: %@", name);
+    XCTAssertTrue([Message2 instancesRespondToSelector:setHasSel], @"field: %@", name);
   }
 
   // map<> fields
@@ -186,14 +186,14 @@ - (void)testProto3HasMethodSupport {
     XCTAssertTrue([Message3 instancesRespondToSelector:countSel], @"field: %@", name);
   }
 
-  // OneOf fields - no has*/setHas*
+  // OneOf fields - has*/setHas* is valid.
 
   for (NSString *name in names) {
     // build the selector, i.e. - hasOneofInt32/setHasOneofInt32:
     SEL hasSel = NSSelectorFromString([NSString stringWithFormat:@"hasOneof%@", name]);
     SEL setHasSel = NSSelectorFromString([NSString stringWithFormat:@"setHasOneof%@:", name]);
-    XCTAssertFalse([Message3 instancesRespondToSelector:hasSel], @"field: %@", name);
-    XCTAssertFalse([Message3 instancesRespondToSelector:setHasSel], @"field: %@", name);
+    XCTAssertTrue([Message3 instancesRespondToSelector:hasSel], @"field: %@", name);
+    XCTAssertTrue([Message3 instancesRespondToSelector:setHasSel], @"field: %@", name);
   }
 
   // Single Optional fields

objectivec/Tests/GPBMessageTests.m

@@ -583,6 +583,24 @@ - (void)testSetter {
   XCTAssertFalse(message.hasOptionalString);
   XCTAssertEqualObjects(message.optionalString, @"");
 
+  // Test oneof.
+  XCTAssertFalse(message.hasOneofUint32);
+  XCTAssertEqual(message.oneofUint32, 0U);
+  XCTAssertEqual(message.oneofFieldOneOfCase, TestAllTypes_OneofField_OneOfCase_GPBUnsetOneOfCase);
+  XCTAssertFalse(message.hasOneofUint32);
+  [message setHasOneofUint32:NO];
+  XCTAssertFalse(message.hasOneofUint32);
+  XCTAssertEqual(message.oneofUint32, 0U);
+  XCTAssertEqual(message.oneofFieldOneOfCase, TestAllTypes_OneofField_OneOfCase_GPBUnsetOneOfCase);
+  message.oneofUint32 = 1;
+  XCTAssertEqual(message.oneofUint32, 1);
+  XCTAssertTrue(message.hasOneofUint32);
+  XCTAssertEqual(message.oneofFieldOneOfCase, TestAllTypes_OneofField_OneOfCase_OneofUint32);
+  [message setHasOneofUint32:NO];
+  XCTAssertFalse(message.hasOneofUint32);
+  XCTAssertEqual(message.oneofUint32, 0);
+  XCTAssertEqual(message.oneofFieldOneOfCase, TestAllTypes_OneofField_OneOfCase_GPBUnsetOneOfCase);
+
   // Test optional data.
   XCTAssertFalse(message.hasOptionalBytes);
   XCTAssertEqualObjects(message.optionalBytes, GPBEmptyNSData());

src/google/protobuf/compiler/objectivec/field.cc

@@ -275,7 +275,7 @@ void FieldGenerator::SetOneofIndexBase(int index_base) {
 }
 
 bool FieldGenerator::WantsHasProperty() const {
-  return descriptor_->has_presence() && !descriptor_->real_containing_oneof();
+  return descriptor_->has_presence();
 }
 
 SingleFieldGenerator::SingleFieldGenerator(