Auto-generate files after cl/592091162
diff --git a/ruby/ext/google/protobuf_c/ruby-upb.c b/ruby/ext/google/protobuf_c/ruby-upb.c
index 73b1af4..89431e8 100644
--- a/ruby/ext/google/protobuf_c/ruby-upb.c
+++ b/ruby/ext/google/protobuf_c/ruby-upb.c
@@ -5448,10 +5448,19 @@
// Must be last.
+const upb_Extension* upb_Message_ExtensionByIndex(const upb_Message* msg,
+ size_t index) {
+ size_t count;
+ const upb_Extension* ext = UPB_PRIVATE(_upb_Message_Getexts)(msg, &count);
+
+ UPB_ASSERT(index < count);
+ return &ext[index];
+}
+
const upb_Extension* upb_Message_FindExtensionByNumber(const upb_Message* msg,
uint32_t field_number) {
- size_t count = 0;
- const upb_Extension* ext = _upb_Message_Getexts(msg, &count);
+ size_t count;
+ const upb_Extension* ext = UPB_PRIVATE(_upb_Message_Getexts)(msg, &count);
while (count--) {
if (upb_MiniTableExtension_Number(ext->ext) == field_number) return ext;
@@ -5745,7 +5754,7 @@
}
// Clone extensions.
size_t ext_count;
- const upb_Extension* ext = _upb_Message_Getexts(src, &ext_count);
+ const upb_Extension* ext = UPB_PRIVATE(_upb_Message_Getexts)(src, &ext_count);
for (size_t i = 0; i < ext_count; ++i) {
const upb_Extension* msg_ext = &ext[i];
const upb_MiniTableField* field = &msg_ext->ext->UPB_PRIVATE(field);
@@ -5928,10 +5937,10 @@
// Must be last.
-const upb_Extension* _upb_Message_Getext(const upb_Message* msg,
- const upb_MiniTableExtension* e) {
+const struct upb_Extension* _upb_Message_Getext(
+ const upb_Message* msg, const upb_MiniTableExtension* e) {
size_t n;
- const upb_Extension* ext = _upb_Message_Getexts(msg, &n);
+ const struct upb_Extension* ext = UPB_PRIVATE(_upb_Message_Getexts)(msg, &n);
// For now we use linear search exclusively to find extensions.
// If this becomes an issue due to messages with lots of extensions,
@@ -5945,12 +5954,12 @@
return NULL;
}
-const upb_Extension* _upb_Message_Getexts(const upb_Message* msg,
- size_t* count) {
+const struct upb_Extension* UPB_PRIVATE(_upb_Message_Getexts)(
+ const upb_Message* msg, size_t* count) {
const upb_Message_Internal* in = upb_Message_Getinternal(msg);
if (in->internal) {
- *count =
- (in->internal->size - in->internal->ext_begin) / sizeof(upb_Extension);
+ *count = (in->internal->size - in->internal->ext_begin) /
+ sizeof(struct upb_Extension);
return UPB_PTR_AT(in->internal, in->internal->ext_begin, void);
} else {
*count = 0;
@@ -5958,16 +5967,18 @@
}
}
-upb_Extension* _upb_Message_GetOrCreateExtension(
+struct upb_Extension* _upb_Message_GetOrCreateExtension(
upb_Message* msg, const upb_MiniTableExtension* e, upb_Arena* arena) {
- upb_Extension* ext = (upb_Extension*)_upb_Message_Getext(msg, e);
+ struct upb_Extension* ext =
+ (struct upb_Extension*)_upb_Message_Getext(msg, e);
if (ext) return ext;
- if (!UPB_PRIVATE(_upb_Message_Realloc)(msg, sizeof(upb_Extension), arena))
+ if (!UPB_PRIVATE(_upb_Message_Realloc)(msg, sizeof(struct upb_Extension),
+ arena))
return NULL;
upb_Message_Internal* in = upb_Message_Getinternal(msg);
- in->internal->ext_begin -= sizeof(upb_Extension);
+ in->internal->ext_begin -= sizeof(struct upb_Extension);
ext = UPB_PTR_AT(in->internal, in->internal->ext_begin, void);
- memset(ext, 0, sizeof(upb_Extension));
+ memset(ext, 0, sizeof(struct upb_Extension));
ext->ext = e;
return ext;
}
@@ -6333,7 +6344,7 @@
size_t upb_Message_ExtensionCount(const upb_Message* msg) {
size_t count;
- _upb_Message_Getexts(msg, &count);
+ UPB_PRIVATE(_upb_Message_Getexts)(msg, &count);
return count;
}
@@ -10951,7 +10962,7 @@
if (ext_pool) {
// Return any extensions that are set.
size_t count;
- const upb_Extension* ext = _upb_Message_Getexts(msg, &count);
+ const upb_Extension* ext = UPB_PRIVATE(_upb_Message_Getexts)(msg, &count);
if (i - n < count) {
ext += count - 1 - (i - n);
memcpy(out_val, &ext->data, sizeof(*out_val));
@@ -15101,7 +15112,8 @@
* these in field number order relative to normal fields or even to each
* other. */
size_t ext_count;
- const upb_Extension* ext = _upb_Message_Getexts(msg, &ext_count);
+ const upb_Extension* ext =
+ UPB_PRIVATE(_upb_Message_Getexts)(msg, &ext_count);
if (ext_count) {
if (e->options & kUpb_EncodeOption_Deterministic) {
_upb_sortedmap sorted;
diff --git a/ruby/ext/google/protobuf_c/ruby-upb.h b/ruby/ext/google/protobuf_c/ruby-upb.h
index 3f6da09..9b92b33 100755
--- a/ruby/ext/google/protobuf_c/ruby-upb.h
+++ b/ruby/ext/google/protobuf_c/ruby-upb.h
@@ -1777,11 +1777,11 @@
// Returns an array of extensions for this message.
// Note: the array is ordered in reverse relative to the order of creation.
-const upb_Extension* _upb_Message_Getexts(const upb_Message* msg,
- size_t* count);
+const upb_Extension* UPB_PRIVATE(_upb_Message_Getexts)(const upb_Message* msg,
+ size_t* count);
-// Returns an extension for the given field number, or NULL if no extension
-// exists for this field number.
+// Returns an extension for a message with a given mini table,
+// or NULL if no extension exists with this mini table.
const upb_Extension* _upb_Message_Getext(const upb_Message* msg,
const upb_MiniTableExtension* ext);
@@ -12059,6 +12059,9 @@
extern "C" {
#endif
+const upb_Extension* upb_Message_ExtensionByIndex(const upb_Message* msg,
+ size_t index);
+
// Returns the extension with the given field number, or NULL on failure.
const upb_Extension* upb_Message_FindExtensionByNumber(const upb_Message* msg,
uint32_t field_number);
