Skip to content

[pull] master from ruby:master #587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 11 commits into from
Dec 17, 2025
Merged

[pull] master from ruby:master #587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4fb537b
Make tracepoints with set_trace_func or TracePoint.new ractor local (…
luke-gruber Dec 16, 2025
f3d1557
Revert "ZJIT: Allow ccalls above 7 arguments"
XrXr Dec 16, 2025
eaa952b
YJIT: Print `Rc` strong and weak count on assert failure
XrXr Dec 16, 2025
094418a
gc.h: Reintroduce immediate guard in `rb_obj_written`
byroot Dec 14, 2025
4d4f414
Use RBIMPL_ASSERT_OR_ASSUME instead of ASSUME for better errors when …
eregon Dec 16, 2025
68174c3
ZJIT: Do not call rb_gc_writebarrier() with an immediate value in gen…
eregon Dec 16, 2025
49cecd3
ZJIT: Guard other calls to rb_gc_writebarrier() with a !special_const…
eregon Dec 16, 2025
04edf3d
ZJIT: Add a VALUE#write_barrier helper method to deduplicate logic
eregon Dec 16, 2025
cc048f7
Revert "ZJIT: Do not call rb_gc_writebarrier() with an immediate valu…
eregon Dec 16, 2025
5e27581
ZJIT: Use rb_zjit_writebarrier_check_immediate() instead of rb_gc_wri…
eregon Dec 16, 2025
2d01406
[DOC] Harmonize rb_div methods
BurdetteLamar Dec 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions complex.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -999,9 +999,9 @@ f_divide(VALUE self, VALUE other,

/*
* call-seq:
* complex / numeric -> new_complex
* self / other -> complex
*
* Returns the quotient of +self+ and +numeric+:
* Returns the quotient of +self+ and +other+:
*
* Complex.rect(2, 3) / Complex.rect(2, 3) # => (1+0i)
* Complex.rect(900) / Complex.rect(1) # => (900+0i)
Expand Down
2 changes: 2 additions & 0 deletions depend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7606,6 +7606,7 @@ iseq.$(OBJEXT): {$(VPATH)}onigmo.h
iseq.$(OBJEXT): {$(VPATH)}oniguruma.h
iseq.$(OBJEXT): {$(VPATH)}prism_compile.h
iseq.$(OBJEXT): {$(VPATH)}ractor.h
iseq.$(OBJEXT): {$(VPATH)}ractor_core.h
iseq.$(OBJEXT): {$(VPATH)}ruby_assert.h
iseq.$(OBJEXT): {$(VPATH)}ruby_atomic.h
iseq.$(OBJEXT): {$(VPATH)}rubyparser.h
Expand Down Expand Up @@ -19760,6 +19761,7 @@ vm_trace.$(OBJEXT): {$(VPATH)}onigmo.h
vm_trace.$(OBJEXT): {$(VPATH)}oniguruma.h
vm_trace.$(OBJEXT): {$(VPATH)}prism_compile.h
vm_trace.$(OBJEXT): {$(VPATH)}ractor.h
vm_trace.$(OBJEXT): {$(VPATH)}ractor_core.h
vm_trace.$(OBJEXT): {$(VPATH)}ruby_assert.h
vm_trace.$(OBJEXT): {$(VPATH)}ruby_atomic.h
vm_trace.$(OBJEXT): {$(VPATH)}rubyparser.h
Expand Down
12 changes: 7 additions & 5 deletions gc/default/default.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6090,11 +6090,13 @@ rb_gc_impl_writebarrier(void *objspace_ptr, VALUE a, VALUE b)
{
rb_objspace_t *objspace = objspace_ptr;

if (RGENGC_CHECK_MODE) {
if (SPECIAL_CONST_P(a)) rb_bug("rb_gc_writebarrier: a is special const: %"PRIxVALUE, a);
}

if (SPECIAL_CONST_P(b)) return;
#if RGENGC_CHECK_MODE
if (SPECIAL_CONST_P(a)) rb_bug("rb_gc_writebarrier: a is special const: %"PRIxVALUE, a);
if (SPECIAL_CONST_P(b)) rb_bug("rb_gc_writebarrier: b is special const: %"PRIxVALUE, b);
#else
RBIMPL_ASSERT_OR_ASSUME(!SPECIAL_CONST_P(a));
RBIMPL_ASSERT_OR_ASSUME(!SPECIAL_CONST_P(b));
#endif

GC_ASSERT(!during_gc);
GC_ASSERT(RB_BUILTIN_TYPE(a) != T_NONE);
Expand Down
3 changes: 0 additions & 3 deletions imemo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,9 +306,6 @@ mark_and_move_method_entry(rb_method_entry_t *ment, bool reference_updating)
if (!rb_gc_checking_shareable()) {
rb_gc_mark_and_move(&def->body.bmethod.proc);
}
if (def->body.bmethod.hooks) {
rb_hook_list_mark_and_move(def->body.bmethod.hooks);
}
break;
case VM_METHOD_TYPE_ALIAS:
rb_gc_mark_and_move_ptr(&def->body.alias.original_me);
Expand Down
2 changes: 1 addition & 1 deletion include/ruby/internal/abi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
* In released versions of Ruby, this number is not defined since teeny
* versions of Ruby should guarantee ABI compatibility.
*/
#define RUBY_ABI_VERSION 0
#define RUBY_ABI_VERSION 1

/* Windows does not support weak symbols so ruby_abi_version will not exist
* in the shared library. */
Expand Down
4 changes: 3 additions & 1 deletion include/ruby/internal/gc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -785,7 +785,9 @@ rb_obj_written(
RGENGC_LOGGING_OBJ_WRITTEN(a, oldv, b, filename, line);
#endif

rb_gc_writebarrier(a, b);
if (!RB_SPECIAL_CONST_P(b)) {
rb_gc_writebarrier(a, b);
}

return a;
}
Expand Down
Loading