Use call sites to check builtin here.

jruby · May 30, 2018 · d386338 · d386338
1 parent 083a0a2
commit d386338
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/core/src/main/java/org/jruby/runtime/JavaSites.java b/core/src/main/java/org/jruby/runtime/JavaSites.java
@@ -18,6 +18,7 @@ public class JavaSites {
     public final KernelSites Kernel = new KernelSites();
     public final ObjectSites Object = new ObjectSites();
     public final ArraySites Array = new ArraySites();
+    public final Array2Sites Array2 = new Array2Sites();
     public final StringSites String = new StringSites();
     public final HashSites Hash = new HashSites();
     public final NumericSites Numeric = new NumericSites();
@@ -122,6 +123,11 @@ public static class ArraySites {
         public final CallSite op_lt_sort = new FunctionalCachingCallSite("<");
     }
 
+    public static class Array2Sites {
+        public final CachingCallSite op_cmp_fixnum = new FunctionalCachingCallSite("<=>");
+        public final CachingCallSite op_cmp_string = new FunctionalCachingCallSite("<=>");
+    }
+
     public static class StringSites {
         public final CheckedSites to_str_checked = new CheckedSites("to_str");
         public final RespondToCallSite respond_to_cmp = new RespondToCallSite("<=>");

diff --git a/core/src/main/java/org/jruby/specialized/RubyArrayTwoObject.java b/core/src/main/java/org/jruby/specialized/RubyArrayTwoObject.java
@@ -9,6 +9,7 @@
 import org.jruby.RubyString;
 import org.jruby.javasupport.JavaUtil;
 import org.jruby.runtime.Block;
+import org.jruby.runtime.JavaSites;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.runtime.invokedynamic.MethodNames;
@@ -263,8 +264,9 @@ protected IRubyObject sortInternal(final ThreadContext context, boolean honorOve
         Ruby runtime = context.runtime;
 
         // One check per specialized fast-path to make the check invariant.
-        final boolean fixnumBypass = !honorOverride || runtime.getFixnum().isMethodBuiltin("<=>");
-        final boolean stringBypass = !honorOverride || runtime.getString().isMethodBuiltin("<=>");
+        JavaSites.Array2Sites sites = sites(context);
+        final boolean fixnumBypass = !honorOverride || sites.op_cmp_fixnum.retrieveCache(runtime.getFixnum()).method.isBuiltin();
+        final boolean stringBypass = !honorOverride || sites.op_cmp_string.retrieveCache(runtime.getString()).method.isBuiltin();
 
         IRubyObject o1 = car;
         IRubyObject o2 = cdr;
@@ -333,4 +335,8 @@ public IRubyObject uniq(ThreadContext context) {
             return new RubyArrayTwoObject(this);
         }
     }
+
+    private static final JavaSites.Array2Sites sites(ThreadContext context) {
+        return context.sites.Array2;
+    }
 }