Skip to content

Cleanup recursion guards #9273

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

Closed
headius wants to merge 2 commits into from
Closed

Cleanup recursion guards #9273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd2eb05
Use execRecursive for Array#join
headius Feb 28, 2026
13e2aae
Use execRecursive for Array#inspect
headius Feb 28, 2026
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
15 changes: 5 additions & 10 deletions core/src/main/java/org/jruby/RubyArrayNative.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1635,7 +1635,9 @@ public RubyArray concat(IRubyObject obj) {
/** inspect_ary
*
*/
protected IRubyObject inspectAry(ThreadContext context) {
protected IRubyObject inspectAry(ThreadContext context, boolean recur) {
if (recur) return newSharedString(context, RECURSIVE_ARRAY_BL);

RubyString str = RubyString.newStringLight(context.runtime, DEFAULT_INSPECT_STR_SIZE, USASCIIEncoding.INSTANCE);
str.cat((byte) '[');

Expand All @@ -1661,14 +1663,7 @@ protected IRubyObject inspectAry(ThreadContext context) {
public RubyString inspect(ThreadContext context) {
final Ruby runtime = context.runtime;
if (realLength == 0) return newSharedString(context, EMPTY_ARRAY_BL);
if (runtime.isInspecting(this)) return newSharedString(context, RECURSIVE_ARRAY_BL);

try {
runtime.registerInspecting(this);
return (RubyString) inspectAry(context);
} finally {
runtime.unregisterInspecting(this);
}
return (RubyString) context.execRecursive((ctx, state, obj, recur) -> state.inspectAry(ctx, recur), this, this, "inspect");
}

// MRI: rb_ary_first
Expand Down Expand Up @@ -1883,7 +1878,7 @@ private void recursiveJoin(final ThreadContext context, final IRubyObject outVal

first[0] = false;

context.safeRecurse(JOIN_RECURSIVE, new JoinRecursive.State(ary, outValue, sep, result, first), outValue, "join", true);
context.execRecursive(JOIN_RECURSIVE, new JoinRecursive.State(ary, outValue, sep, result, first), outValue, "join");
}

/** rb_ary_join
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/org/jruby/specialized/RubyArrayOneObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,8 @@ public int indexOf(Object element) {
}

@Override
protected IRubyObject inspectAry(ThreadContext context) {
if (!packed()) return super.inspectAry(context);
protected IRubyObject inspectAry(ThreadContext context, boolean recur) {
if (recur || !packed()) return super.inspectAry(context, recur);

final Ruby runtime = context.runtime;
RubyString str = RubyString.newStringLight(runtime, DEFAULT_INSPECT_STR_SIZE, USASCIIEncoding.INSTANCE);
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/org/jruby/specialized/RubyArrayTwoObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,8 @@ public int indexOf(Object element) {
}

@Override
protected IRubyObject inspectAry(ThreadContext context) {
if (!packed()) return super.inspectAry(context);
protected IRubyObject inspectAry(ThreadContext context, boolean recur) {
if (recur || !packed()) return super.inspectAry(context, recur);

final Ruby runtime = context.runtime;
RubyString str = RubyString.newStringLight(runtime, DEFAULT_INSPECT_STR_SIZE, USASCIIEncoding.INSTANCE);
Expand Down
Loading