Merge remote-tracking branch 'upstream/master' into Ractor-Local-GC-v…

…ersion-2
rm155 · Feb 28, 2024 · 4e49fc2 · 4e49fc2
2 parents fd05e55 + dcc976a
commit 4e49fc2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/internal/gc.h b/internal/gc.h
@@ -290,7 +290,6 @@ size_t rb_gc_obj_slot_size(VALUE obj);
 bool rb_gc_size_allocatable_p(size_t size);
 int rb_objspace_garbage_object_p(VALUE obj);
 bool rb_gc_is_ptr_to_obj(const void *ptr);
-VALUE rb_gc_id2ref_obj_tbl(VALUE objid);
 VALUE rb_define_finalizer_no_check(VALUE obj, VALUE block);
 
 int rb_during_local_gc(void);

diff --git a/spec/ruby/command_line/dash_v_spec.rb b/spec/ruby/command_line/dash_v_spec.rb
@@ -6,7 +6,7 @@
 
   describe "when used alone" do
     it "prints version and ends" do
-      ruby_exe(nil, args: '-v').should include(RUBY_DESCRIPTION)
+      ruby_exe(nil, args: '-v').sub("+PRISM ", "").should include(RUBY_DESCRIPTION)
     end unless (defined?(RubyVM::YJIT) && RubyVM::YJIT.enabled?) ||
                (defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled?) ||
                (ENV['RUBY_MN_THREADS'] == '1')