rbs 3.10.1 → 3.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0e199e19fdc063a93575bc59d1daff68480bc7c678e0b9a00a20bd882c0167f
-  data.tar.gz: 42415916b4eebb2b739ce009088fd8fcec8c02a8ad0c4169ccf57dd9b69bba79
+  metadata.gz: 70df198075a49a0a5368d2eee44e7027b76467fa56551b23280b5bba9b9bd823
+  data.tar.gz: 179815f7909503adc3b948e63f01ec185abc3da7ea1598e4847cc1d097074e3b
 SHA512:
-  metadata.gz: a9ba79e77d4f6ca3b57f6a89e245e20edd6ceba274475ad435a4bfb45e78dc17e4ab3ca033b208279b4ee1bef0498d82459ef912bbc2dfcabb16c921f4802e72
-  data.tar.gz: 8c8100da156288e99931d15f0a3e61439a08d51e3d85605f95770d62cdfc4e1fd3cc71ede93763ce08e480084ed8301a26b781db3988b7fc931ea727fccd7e29
+  metadata.gz: 99ccdcfdfe2cbf1aa0462df15cdd731b7e48e17014265da20769922ac4dedd90710b55370eff2ed0a35d1f14f9d571c6c1b9138fdd54cf9a3a73e6ba6dfd37dd
+  data.tar.gz: 4daa010fef1e4ab1d0fac6c6c8e1a5e4bcad2fe08ff154a4e731389a8d18cc78de30f21be6207a737e4d757d93ef2e09ef5629a65ce17fa191d14d415bcdb95a

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 3.10.2 (2026-01-07)
+
+This is a minor fix on arena allocator alignment.
+
+### Pull Requests
+
+* Merge pull request #2788 from ruby/fix-alloc-alignment ([#2790](https://github.com/ruby/rbs/pull/2790))
+
 ## 3.10.1 (2026-01-07)
 
 This is a follow-up release for Ruby 4.0.0 with documentation update based on Ruby 4.0.0, and bugfixes related to set/pathname library loading.

data/lib/rbs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RBS
-  VERSION = "3.10.1"
+  VERSION = "3.10.2"
 end

data/src/util/rbs_allocator.c

@@ -54,6 +54,12 @@ static size_t get_system_page_size(void) {
 #endif
 }
 
+static inline uintptr_t rbs_align_up_uintptr(uintptr_t value, size_t alignment) {
+    // alignment must be a non-zero power of two
+    RBS_ASSERT(alignment != 0 && (alignment & (alignment - 1)) == 0, "alignment must be a non-zero power of two. alignment: %zu", alignment);
+    return (value + (alignment - 1)) & ~(uintptr_t) (alignment - 1);
+}
+
 static rbs_allocator_page_t *rbs_allocator_page_new(size_t payload_size) {
     const size_t page_header_size = sizeof(rbs_allocator_page_t);
 
@@ -98,10 +104,9 @@ void *rbs_allocator_realloc_impl(rbs_allocator_t *allocator, void *ptr, size_t o
 
 // Allocates `size` bytes from `allocator`, aligned to an `alignment`-byte boundary.
 void *rbs_allocator_malloc_impl(rbs_allocator_t *allocator, size_t size, size_t alignment) {
-    RBS_ASSERT(size % alignment == 0, "size must be a multiple of the alignment. size: %zu, alignment: %zu", size, alignment);
-
     if (allocator->default_page_payload_size < size) { // Big allocation, give it its own page.
-        rbs_allocator_page_t *new_page = rbs_allocator_page_new(size);
+        // Add padding to ensure we can align the start pointer within this page
+        rbs_allocator_page_t *new_page = rbs_allocator_page_new(size + (alignment - 1));
 
         // This simple allocator can only put small allocations into the head page.
         // Naively prepending this large allocation page to the head of the allocator before the previous head page
@@ -120,21 +125,29 @@ void *rbs_allocator_malloc_impl(rbs_allocator_t *allocator, size_t size, size_t
         new_page->next = allocator->page->next;
         allocator->page->next = new_page;
 
-        uintptr_t pointer = (uintptr_t) new_page + sizeof(rbs_allocator_page_t);
-        return (void *) pointer;
+        uintptr_t base = (uintptr_t) new_page + sizeof(rbs_allocator_page_t);
+        uintptr_t aligned_ptr = rbs_align_up_uintptr(base, alignment);
+        return (void *) aligned_ptr;
     }
 
     rbs_allocator_page_t *page = allocator->page;
-    if (page->used + size > page->size) {
+    uintptr_t base = (uintptr_t) page + sizeof(rbs_allocator_page_t);
+
+    // Compute aligned offset within the payload
+    size_t used_aligned = (size_t) (rbs_align_up_uintptr(base + page->used, alignment) - base);
+
+    if (used_aligned + size > page->size) {
         // Not enough space. Allocate a new small page and prepend it to the allocator's linked list.
         rbs_allocator_page_t *new_page = rbs_allocator_page_new(allocator->default_page_payload_size);
         new_page->next = allocator->page;
         allocator->page = new_page;
         page = new_page;
+        base = (uintptr_t) page + sizeof(rbs_allocator_page_t);
+        used_aligned = (size_t) (rbs_align_up_uintptr(base, alignment) - base); // start of fresh page (usually 0 if header is aligned)
     }
 
-    uintptr_t pointer = (uintptr_t) page + sizeof(rbs_allocator_page_t) + page->used;
-    page->used += size;
+    uintptr_t pointer = base + used_aligned;
+    page->used = used_aligned + size;
     return (void *) pointer;
 }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbs
 version: !ruby/object:Gem::Version
-  version: 3.10.1
+  version: 3.10.2
 platform: ruby
 authors:
 - Soutaro Matsumoto
@@ -563,7 +563,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Type signature for Ruby.
 test_files: []