Updated amalgamations for PHP and Ruby.

haberman · haberman · commit c773dc9f640b · 2024-02-27T12:44:26.000-08:00
diff --git a/php/ext/google/protobuf/php-upb.c b/php/ext/google/protobuf/php-upb.c
@@ -4571,9 +4571,10 @@ static upb_ArenaRoot _upb_Arena_FindRoot(upb_Arena* a) {
   return (upb_ArenaRoot){.root = ai, .tagged_count = poc};
 }
 
-size_t upb_Arena_SpaceAllocated(upb_Arena* arena) {
+size_t upb_Arena_SpaceAllocated(upb_Arena* arena, size_t* fused_count) {
   upb_ArenaInternal* ai = _upb_Arena_FindRoot(arena).root;
   size_t memsize = 0;
+  size_t local_fused_count = 0;
 
   while (ai != NULL) {
     upb_MemBlock* block = upb_Atomic_Load(&ai->blocks, memory_order_relaxed);
@@ -4582,8 +4583,10 @@ size_t upb_Arena_SpaceAllocated(upb_Arena* arena) {
       block = upb_Atomic_Load(&block->next, memory_order_relaxed);
     }
     ai = upb_Atomic_Load(&ai->next, memory_order_relaxed);
+    local_fused_count++;
   }
 
+  if (fused_count) *fused_count = local_fused_count;
   return memsize;
 }
 
diff --git a/php/ext/google/protobuf/php-upb.h b/php/ext/google/protobuf/php-upb.h
@@ -347,7 +347,7 @@ void __asan_unpoison_memory_region(void const volatile *addr, size_t size);
 
 // Must be last.
 
-#define _kUpb_Status_MaxMessage 127
+#define _kUpb_Status_MaxMessage 511
 
 typedef struct {
   bool ok;
@@ -778,7 +778,7 @@ UPB_API bool upb_Arena_Fuse(upb_Arena* a, upb_Arena* b);
 bool upb_Arena_IncRefFor(upb_Arena* a, const void* owner);
 void upb_Arena_DecRefFor(upb_Arena* a, const void* owner);
 
-size_t upb_Arena_SpaceAllocated(upb_Arena* a);
+size_t upb_Arena_SpaceAllocated(upb_Arena* a, size_t* fused_count);
 uint32_t upb_Arena_DebugRefCount(upb_Arena* a);
 
 UPB_API_INLINE upb_Arena* upb_Arena_New(void) {
diff --git a/ruby/ext/google/protobuf_c/ruby-upb.c b/ruby/ext/google/protobuf_c/ruby-upb.c
@@ -4085,9 +4085,10 @@ static upb_ArenaRoot _upb_Arena_FindRoot(upb_Arena* a) {
   return (upb_ArenaRoot){.root = ai, .tagged_count = poc};
 }
 
-size_t upb_Arena_SpaceAllocated(upb_Arena* arena) {
+size_t upb_Arena_SpaceAllocated(upb_Arena* arena, size_t* fused_count) {
   upb_ArenaInternal* ai = _upb_Arena_FindRoot(arena).root;
   size_t memsize = 0;
+  size_t local_fused_count = 0;
 
   while (ai != NULL) {
     upb_MemBlock* block = upb_Atomic_Load(&ai->blocks, memory_order_relaxed);
@@ -4096,8 +4097,10 @@ size_t upb_Arena_SpaceAllocated(upb_Arena* arena) {
       block = upb_Atomic_Load(&block->next, memory_order_relaxed);
     }
     ai = upb_Atomic_Load(&ai->next, memory_order_relaxed);
+    local_fused_count++;
   }
 
+  if (fused_count) *fused_count = local_fused_count;
   return memsize;
 }
 
diff --git a/ruby/ext/google/protobuf_c/ruby-upb.h b/ruby/ext/google/protobuf_c/ruby-upb.h
@@ -349,7 +349,7 @@ void __asan_unpoison_memory_region(void const volatile *addr, size_t size);
 
 // Must be last.
 
-#define _kUpb_Status_MaxMessage 127
+#define _kUpb_Status_MaxMessage 511
 
 typedef struct {
   bool ok;
@@ -780,7 +780,7 @@ UPB_API bool upb_Arena_Fuse(upb_Arena* a, upb_Arena* b);
 bool upb_Arena_IncRefFor(upb_Arena* a, const void* owner);
 void upb_Arena_DecRefFor(upb_Arena* a, const void* owner);
 
-size_t upb_Arena_SpaceAllocated(upb_Arena* a);
+size_t upb_Arena_SpaceAllocated(upb_Arena* a, size_t* fused_count);
 uint32_t upb_Arena_DebugRefCount(upb_Arena* a);
 
 UPB_API_INLINE upb_Arena* upb_Arena_New(void) {

Original file line number	Diff line number	Diff line change
`@@ -4571,9 +4571,10 @@ static upb_ArenaRoot _upb_Arena_FindRoot(upb_Arena* a) {`
`4571`	`4571`	`return (upb_ArenaRoot){.root = ai, .tagged_count = poc};`
`4572`	`4572`	`}`
`4573`	`4573`
`4574`		`-size_t upb_Arena_SpaceAllocated(upb_Arena* arena) {`
	`4574`	`+size_t upb_Arena_SpaceAllocated(upb_Arena* arena, size_t* fused_count) {`
`4575`	`4575`	`upb_ArenaInternal* ai = _upb_Arena_FindRoot(arena).root;`
`4576`	`4576`	`size_t memsize = 0;`
	`4577`	`+ size_t local_fused_count = 0;`
`4577`	`4578`
`4578`	`4579`	`while (ai != NULL) {`
`4579`	`4580`	`upb_MemBlock* block = upb_Atomic_Load(&ai->blocks, memory_order_relaxed);`
`@@ -4582,8 +4583,10 @@ size_t upb_Arena_SpaceAllocated(upb_Arena* arena) {`
`4582`	`4583`	`block = upb_Atomic_Load(&block->next, memory_order_relaxed);`
`4583`	`4584`	`}`
`4584`	`4585`	`ai = upb_Atomic_Load(&ai->next, memory_order_relaxed);`
	`4586`	`+ local_fused_count++;`
`4585`	`4587`	`}`
`4586`	`4588`
	`4589`	`+ if (fused_count) *fused_count = local_fused_count;`
`4587`	`4590`	`return memsize;`
`4588`	`4591`	`}`
`4589`	`4592`
Original file line number	Diff line number	Diff line change
`@@ -4085,9 +4085,10 @@ static upb_ArenaRoot _upb_Arena_FindRoot(upb_Arena* a) {`
`4085`	`4085`	`return (upb_ArenaRoot){.root = ai, .tagged_count = poc};`
`4086`	`4086`	`}`
`4087`	`4087`
`4088`		`-size_t upb_Arena_SpaceAllocated(upb_Arena* arena) {`
	`4088`	`+size_t upb_Arena_SpaceAllocated(upb_Arena* arena, size_t* fused_count) {`
`4089`	`4089`	`upb_ArenaInternal* ai = _upb_Arena_FindRoot(arena).root;`
`4090`	`4090`	`size_t memsize = 0;`
	`4091`	`+ size_t local_fused_count = 0;`
`4091`	`4092`
`4092`	`4093`	`while (ai != NULL) {`
`4093`	`4094`	`upb_MemBlock* block = upb_Atomic_Load(&ai->blocks, memory_order_relaxed);`
`@@ -4096,8 +4097,10 @@ size_t upb_Arena_SpaceAllocated(upb_Arena* arena) {`
`4096`	`4097`	`block = upb_Atomic_Load(&block->next, memory_order_relaxed);`
`4097`	`4098`	`}`
`4098`	`4099`	`ai = upb_Atomic_Load(&ai->next, memory_order_relaxed);`
	`4100`	`+ local_fused_count++;`
`4099`	`4101`	`}`
`4100`	`4102`
	`4103`	`+ if (fused_count) *fused_count = local_fused_count;`
`4101`	`4104`	`return memsize;`
`4102`	`4105`	`}`
`4103`	`4106`