Automated rollback of commit 7a09c4569b.

PiperOrigin-RevId: 629808114

upb/message/accessors.h

@@ -68,9 +68,11 @@ UPB_API_INLINE bool upb_Message_SetExtension(upb_Message* msg,
                                              const upb_MiniTableExtension* e,
                                              const void* val, upb_Arena* a);
 
-UPB_API_INLINE void upb_Message_ClearOneof(upb_Message* msg,
+UPB_API_INLINE uint32_t upb_Message_WhichOneofFieldNumber(
-                                           const upb_MiniTable* m,
+    const upb_Message* message, const upb_MiniTableField* oneof_field) {
-                                           const upb_MiniTableField* f);
+  UPB_ASSUME(upb_MiniTableField_IsInOneof(oneof_field));
+  return UPB_PRIVATE(_upb_Message_GetOneofCase)(message, oneof_field);
+}
 
 // NOTE: The default_val is only used for fields that support presence.
 // For repeated/map fields, the resulting upb_Array*/upb_Map* can be NULL if a

upb/message/accessors_test.cc

@@ -477,28 +477,5 @@ TEST(GeneratedCode, EnumClosedCheck) {
   EXPECT_TRUE(upb_MiniTableField_IsClosedEnum(closedEnumField));
   upb_Arena_Free(arena);
 }
-TEST(GeneratedCode, OneofClear) {
-  upb_Arena* arena = upb_Arena_New();
-
-  protobuf_test_messages_proto2_TestAllTypesProto2* msg =
-      protobuf_test_messages_proto2_TestAllTypesProto2_new(arena);
-
-  const upb_MiniTable* table =
-      &protobuf_0test_0messages__proto2__TestAllTypesProto2_msg_init;
-
-  // oneof_uint32
-  const upb_MiniTableField* oneofField =
-      upb_MiniTable_FindFieldByNumber(table, 111);
-  EXPECT_TRUE(upb_MiniTableField_IsInOneof(oneofField));
-  protobuf_test_messages_proto2_TestAllTypesProto2_set_oneof_uint32(msg, 522);
-  EXPECT_TRUE(
-      protobuf_test_messages_proto2_TestAllTypesProto2_has_oneof_uint32(msg));
-
-  upb_Message_ClearOneof((upb_Message*)msg, table, oneofField);
-  EXPECT_FALSE(
-      protobuf_test_messages_proto2_TestAllTypesProto2_has_oneof_uint32(msg));
-
-  upb_Arena_Free(arena);
-}
 
 }  // namespace

upb/message/internal/accessors.h

@@ -335,27 +335,6 @@ UPB_API_INLINE void upb_Message_ClearExtension(
   }
 }
 
-UPB_API_INLINE uint32_t upb_Message_WhichOneofFieldNumber(
-    const struct upb_Message* message, const upb_MiniTableField* oneof_field) {
-  UPB_ASSUME(upb_MiniTableField_IsInOneof(oneof_field));
-  return UPB_PRIVATE(_upb_Message_GetOneofCase)(message, oneof_field);
-}
-
-UPB_API_INLINE void upb_Message_ClearOneof(struct upb_Message* msg,
-                                           const upb_MiniTable* m,
-                                           const upb_MiniTableField* f) {
-  UPB_ASSERT(!upb_Message_IsFrozen(msg));
-  uint32_t field_number = upb_Message_WhichOneofFieldNumber(msg, f);
-  if (field_number == 0) {
-    // No field in the oneof is set.
-    return;
-  }
-
-  const upb_MiniTableField* field =
-      upb_MiniTable_FindFieldByNumber(m, field_number);
-  upb_Message_ClearBaseField(msg, field);
-}
-
 UPB_INLINE void _upb_Message_AssertMapIsUntagged(
     const struct upb_Message* msg, const upb_MiniTableField* field) {
   UPB_UNUSED(msg);