commit 7bdd38e1f1d4e5c8f2cc1f27e93bd62c085f90e4
author Protobuf Team Bot <protobuf-team-bot@google.com> Fri Dec 01 23:06:45 2023 +0000
committer Protobuf Team Bot <protobuf-team-bot@google.com> Fri Dec 01 23:06:45 2023 +0000
tree 322e87673ba1c7a3cf576ae7a09b0d4e369f0670
parent 848a2bfd4181fb4362a2df62c0f36f85ad2a3523

Auto-generate files after cl/587127664

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

diff --git a/ruby/ext/google/protobuf_c/ruby-upb.h b/ruby/ext/google/protobuf_c/ruby-upb.h
index 455352d..27f49ec 100755
--- a/ruby/ext/google/protobuf_c/ruby-upb.h
+++ b/ruby/ext/google/protobuf_c/ruby-upb.h
@@ -1011,6 +1011,8 @@
 #ifndef UPB_MINI_TABLE_FIELD_H_
 #define UPB_MINI_TABLE_FIELD_H_
 
+#include <stdint.h>
+
 
 #ifndef UPB_MINI_TABLE_INTERNAL_FIELD_H_
 #define UPB_MINI_TABLE_INTERNAL_FIELD_H_
@@ -1090,7 +1092,7 @@
 
 // LINT.IfChange(struct_definition)
 struct upb_MiniTableField {
-  uint32_t number;
+  uint32_t UPB_ONLYBITS(number);
   uint16_t offset;
   int16_t presence;  // If >0, hasbit_index.  If <0, ~oneof_index
 
@@ -1226,6 +1228,11 @@
   }
 }
 
+UPB_INLINE uint32_t
+UPB_PRIVATE(_upb_MiniTableField_Number)(const struct upb_MiniTableField* f) {
+  return f->UPB_ONLYBITS(number);
+}
+
 UPB_INLINE void UPB_PRIVATE(_upb_MiniTableField_CheckIsArray)(
     const struct upb_MiniTableField* f) {
   UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) ==
@@ -1308,6 +1315,10 @@
   return UPB_PRIVATE(_upb_MiniTableField_IsSubMessage)(f);
 }
 
+UPB_API_INLINE uint32_t upb_MiniTableField_Number(const upb_MiniTableField* f) {
+  return UPB_PRIVATE(_upb_MiniTableField_Number)(f);
+}
+
 UPB_API_INLINE upb_FieldType
 upb_MiniTableField_Type(const upb_MiniTableField* f) {
   return UPB_PRIVATE(_upb_MiniTableField_Type)(f);
@@ -1631,7 +1642,7 @@
 
 UPB_INLINE uint32_t UPB_PRIVATE(_upb_MiniTableExtension_Number)(
     const struct upb_MiniTableExtension* e) {
-  return e->UPB_PRIVATE(field).number;
+  return e->UPB_PRIVATE(field).UPB_ONLYBITS(number);
 }
 
 UPB_INLINE const struct upb_MiniTable* UPB_PRIVATE(
@@ -2556,7 +2567,7 @@
 
 UPB_INLINE void _upb_Message_SetOneofCase(upb_Message* msg,
                                           const upb_MiniTableField* f) {
-  *_upb_Message_OneofCasePtr(msg, f) = f->number;
+  *_upb_Message_OneofCasePtr(msg, f) = upb_MiniTableField_Number(f);
 }
 
 // TODO: implement _upb_Message_ClearOneofCase()
@@ -2664,7 +2675,8 @@
   UPB_ASSERT(upb_MiniTableField_HasPresence(field));
   UPB_ASSUME(!upb_MiniTableField_IsExtension(field));
   if (upb_MiniTableField_IsInOneof(field)) {
-    return _upb_Message_GetOneofCase(msg, field) == field->number;
+    return _upb_Message_GetOneofCase(msg, field) ==
+           upb_MiniTableField_Number(field);
   } else {
     return _upb_Message_GetHasbitByField(msg, field);
   }
@@ -2762,7 +2774,7 @@
     _upb_Message_ClearHasbitByField(msg, field);
   } else if (upb_MiniTableField_IsInOneof(field)) {
     uint32_t* ptr = _upb_Message_OneofCasePtr(msg, field);
-    if (*ptr != field->number) return;
+    if (*ptr != upb_MiniTableField_Number(field)) return;
     *ptr = 0;
   }
   const char zeros[16] = {0};