Auto-generate files after cl/596588385

php/ext/google/protobuf/php-upb.c

@@ -12942,7 +12942,7 @@ const upb_MiniTableField* upb_FieldDef_MiniTable(const upb_FieldDef* f) {
   }
 }
 
-const upb_MiniTableExtension* _upb_FieldDef_ExtensionMiniTable(
+const upb_MiniTableExtension* upb_FieldDef_MiniTableExtension(
     const upb_FieldDef* f) {
   UPB_ASSERT(upb_FieldDef_IsExtension(f));
   const upb_FileDef* file = upb_FieldDef_File(f);
@@ -13436,7 +13436,7 @@ static void _upb_FieldDef_CreateExt(upb_DefBuilder* ctx, const char* prefix,
 
   if (ctx->layout) {
     UPB_ASSERT(upb_MiniTableExtension_Number(
-                   _upb_FieldDef_ExtensionMiniTable(f)) == f->number_);
+                   upb_FieldDef_MiniTableExtension(f)) == f->number_);
   }
 }
 
@@ -13628,7 +13628,7 @@ static void resolve_extension(upb_DefBuilder* ctx, const char* prefix,
 
 void _upb_FieldDef_BuildMiniTableExtension(upb_DefBuilder* ctx,
                                            const upb_FieldDef* f) {
-  const upb_MiniTableExtension* ext = _upb_FieldDef_ExtensionMiniTable(f);
+  const upb_MiniTableExtension* ext = upb_FieldDef_MiniTableExtension(f);
 
   if (ctx->layout) {
     UPB_ASSERT(upb_FieldDef_Number(f) == upb_MiniTableExtension_Number(ext));
@@ -14614,7 +14614,13 @@ bool upb_Message_SetFieldByDef(upb_Message* msg, const upb_FieldDef* f,
 }
 
 void upb_Message_ClearFieldByDef(upb_Message* msg, const upb_FieldDef* f) {
-  upb_Message_ClearField(msg, upb_FieldDef_MiniTable(f));
+  const upb_MiniTableField* m_f = upb_FieldDef_MiniTable(f);
+
+  if (upb_MiniTableField_IsExtension(m_f)) {
+    upb_Message_ClearExtension(msg, (const upb_MiniTableExtension*)m_f);
+  } else {
+    upb_Message_ClearBaseField(msg, m_f);
+  }
 }
 
 void upb_Message_ClearByDef(upb_Message* msg, const upb_MessageDef* m) {

ruby/ext/google/protobuf_c/ruby-upb.c

@@ -12458,7 +12458,7 @@ const upb_MiniTableField* upb_FieldDef_MiniTable(const upb_FieldDef* f) {
   }
 }
 
-const upb_MiniTableExtension* _upb_FieldDef_ExtensionMiniTable(
+const upb_MiniTableExtension* upb_FieldDef_MiniTableExtension(
     const upb_FieldDef* f) {
   UPB_ASSERT(upb_FieldDef_IsExtension(f));
   const upb_FileDef* file = upb_FieldDef_File(f);
@@ -12952,7 +12952,7 @@ static void _upb_FieldDef_CreateExt(upb_DefBuilder* ctx, const char* prefix,
 
   if (ctx->layout) {
     UPB_ASSERT(upb_MiniTableExtension_Number(
-                   _upb_FieldDef_ExtensionMiniTable(f)) == f->number_);
+                   upb_FieldDef_MiniTableExtension(f)) == f->number_);
   }
 }
 
@@ -13144,7 +13144,7 @@ static void resolve_extension(upb_DefBuilder* ctx, const char* prefix,
 
 void _upb_FieldDef_BuildMiniTableExtension(upb_DefBuilder* ctx,
                                            const upb_FieldDef* f) {
-  const upb_MiniTableExtension* ext = _upb_FieldDef_ExtensionMiniTable(f);
+  const upb_MiniTableExtension* ext = upb_FieldDef_MiniTableExtension(f);
 
   if (ctx->layout) {
     UPB_ASSERT(upb_FieldDef_Number(f) == upb_MiniTableExtension_Number(ext));
@@ -14130,7 +14130,13 @@ bool upb_Message_SetFieldByDef(upb_Message* msg, const upb_FieldDef* f,
 }
 
 void upb_Message_ClearFieldByDef(upb_Message* msg, const upb_FieldDef* f) {
-  upb_Message_ClearField(msg, upb_FieldDef_MiniTable(f));
+  const upb_MiniTableField* m_f = upb_FieldDef_MiniTable(f);
+
+  if (upb_MiniTableField_IsExtension(m_f)) {
+    upb_Message_ClearExtension(msg, (const upb_MiniTableExtension*)m_f);
+  } else {
+    upb_Message_ClearBaseField(msg, m_f);
+  }
 }
 
 void upb_Message_ClearByDef(upb_Message* msg, const upb_MessageDef* m) {