Associate a SwitchPoint with each CacheEntry for active inval'ing.

jruby · Aug 25, 2017 · e76c974 · e76c974
1 parent fe1066a
commit e76c974
Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/core/src/main/java/org/jruby/RubyModule.java b/core/src/main/java/org/jruby/RubyModule.java
@@ -1201,6 +1201,7 @@ public void addMethod(String name, DynamicMethod method) {
     }
 
     public final void addMethodInternal(String name, DynamicMethod method) {
+        searchWithCache(name).invalidate();
         synchronized(methodLocation.getMethodsForWrite()) {
             addMethodAtBootTimeOnly(name, method);
             invalidateCoreClasses();
@@ -1356,7 +1357,7 @@ private CacheEntry cacheHit(String name) {
         CacheEntry cacheEntry = methodLocation.getCachedMethods().get(name);
 
         if (cacheEntry != null) {
-            if (cacheEntry.token == getGeneration()) {
+            if (!cacheEntry.getValidator().hasBeenInvalidated()) {
                 return cacheEntry;
             }
         }

diff --git a/core/src/main/java/org/jruby/internal/runtime/methods/DynamicMethod.java b/core/src/main/java/org/jruby/internal/runtime/methods/DynamicMethod.java
@@ -30,6 +30,7 @@
 
 package org.jruby.internal.runtime.methods;
 
+import java.lang.invoke.SwitchPoint;
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import org.jruby.MetaClass;

diff --git a/core/src/main/java/org/jruby/ir/targets/InvokeSite.java b/core/src/main/java/org/jruby/ir/targets/InvokeSite.java
@@ -6,6 +6,7 @@
 import com.headius.invokebinder.SmartHandle;
 import org.jruby.Ruby;
 import org.jruby.RubyBasicObject;
+import org.jruby.RubyBignum;
 import org.jruby.RubyBoolean;
 import org.jruby.RubyClass;
 import org.jruby.RubyFixnum;
@@ -138,9 +139,9 @@ public static CallSite bootstrap(InvokeSite site, MethodHandles.Lookup lookup) {
 
     public IRubyObject invoke(ThreadContext context, IRubyObject caller, IRubyObject self, IRubyObject[] args, Block block) throws Throwable {
         RubyClass selfClass = pollAndGetClass(context, self);
-        SwitchPoint switchPoint = (SwitchPoint) selfClass.getInvalidator().getData();
         CacheEntry entry = selfClass.searchWithCache(methodName);
         DynamicMethod method = entry.method;
+        SwitchPoint switchPoint = entry.getValidator();
 
         if (methodMissing(entry, caller)) {
             // Test thresholds so we don't do this forever (#4596)
@@ -399,6 +400,7 @@ MethodHandle updateInvocationTarget(MethodHandle target, IRubyObject self, RubyM
 
         if (self instanceof RubySymbol ||
                 self instanceof RubyFixnum ||
+                self instanceof RubyBignum ||
                 self instanceof RubyFloat ||
                 self instanceof RubyNil ||
                 self instanceof RubyBoolean.True ||

diff --git a/core/src/main/java/org/jruby/runtime/callsite/CacheEntry.java b/core/src/main/java/org/jruby/runtime/callsite/CacheEntry.java
@@ -4,9 +4,23 @@
 import org.jruby.internal.runtime.methods.DynamicMethod;
 import org.jruby.internal.runtime.methods.UndefinedMethod;
 
+import java.lang.invoke.SwitchPoint;
+
 public class CacheEntry {
     public static final CacheEntry NULL_CACHE = new CacheEntry(UndefinedMethod.INSTANCE, 0);
     public final DynamicMethod method;
+
+    /** The current valid SwitchPoint for the method, invalidated when overridden */
+    protected final SwitchPoint[] validator = {new SwitchPoint()};
+
+    public void invalidate() {
+        SwitchPoint.invalidateAll(validator);
+    }
+
+    public SwitchPoint getValidator() {
+        return validator[0];
+    }
+
     public final int token;
 
     public CacheEntry(DynamicMethod method, int token) {