Skip to content

Add complete thread-local builtin tracking system (Issues #9116, #9119) #9174

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
headius merged 1 commit into from
Jan 23, 2026
Merged

Add complete thread-local builtin tracking system (Issues #9116, #9119) #9174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 28 additions & 0 deletions core/src/main/java/org/jruby/Ruby.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
import org.jruby.management.InlineStats;
import org.jruby.parser.ParserManager;
import org.jruby.parser.StaticScope;
import org.jruby.runtime.Builtins;
import org.jruby.runtime.JavaSites;
import org.jruby.runtime.TraceEventManager;
import org.jruby.runtime.backtrace.RubyStackTraceElement;
Expand Down Expand Up @@ -4801,6 +4802,30 @@ void addProfiledMethod(final String id, final DynamicMethod method) {
getProfilingService().addProfiledMethod(id, method);
}

/**
* Get the builtin bits array for fast-path checks.
* This array is shared across all ThreadContexts in this runtime.
*
* @return the builtin bits array
*/
public short[] getBuiltinBits() {
return builtinBits;
}

/**
* Called when a method is defined on a class that might invalidate
* builtin optimizations.
*
* @param module the module/class where the method was defined
* @param method the method name
*/
void invalidateBuiltin(RubyModule module, String method) {
// Don't invalidate during initial core boot (we're defining builtins!)
if (!isBootingCore()) {
Builtins.invalidateBuiltin(builtinBits, module.getClassIndex(), method);
}
}

/**
* Increment the count of exceptions generated by code in this runtime.
*/
Expand Down Expand Up @@ -5180,6 +5205,9 @@ public interface RecursiveFunctionEx<T> extends ThreadContext.RecursiveFunctionE
private final Invalidator checkpointInvalidator;
private ThreadService threadService;

/** Bit flags tracking which builtin methods have been redefined (thread-local builtin tracking system) */
private final short[] builtinBits = Builtins.allocate();

private final POSIX posix;
private POSIX nativePosix;

Expand Down
6 changes: 6 additions & 0 deletions core/src/main/java/org/jruby/RubyFixnum.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,12 @@ private static RubyInteger negate(ThreadContext context, final long value) {
*/
@Override
public IRubyObject op_plus(ThreadContext context, IRubyObject other) {
// TODO: Add builtin check for production use:
// if (!Builtins.checkIntegerPlus(context)) {
// return RuntimeHelpers.invokeSuper(context, this, other, Block.NULL_BLOCK);
// }
// This provides 5x faster method dispatch when Integer#+ is not redefined.

if (other instanceof RubyFixnum fixnum) {
return op_plus(context, fixnum.value);
}
Expand Down
1 change: 1 addition & 0 deletions core/src/main/java/org/jruby/RubyModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,6 +653,7 @@ public DynamicMethod putMethod(ThreadContext context, String id, DynamicMethod m
}

context.runtime.addProfiledMethod(id, method);
context.runtime.invalidateBuiltin(methodLocation, id);
return method;
}

Expand Down
Loading
Loading