Improve primitiveFlushCacheByMethod

Invalidate the callTargetStable assumption to ensure that the method is removed from various caches. Fixes https://twitter.com/trufflesqueak/status/1416064187030294530
hpi-swa · Jul 17, 2021 · 61d1957 · 61d1957
1 parent 923798c
commit 61d1957
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/model/CompiledCodeObject.java b/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/model/CompiledCodeObject.java
@@ -253,6 +253,11 @@ protected void initializeCallTargetUnsafe() {
         callTarget = Truffle.getRuntime().createCallTarget(rootNode);
     }
 
+    public void flushCache() {
+        /* Invalidate callTargetStable assumption to ensure this method is released from caches. */
+        callTargetStable.invalidate("primitive 116");
+    }
+
     public Assumption getCallTargetStable() {
         return callTargetStable.getAssumption();
     }

diff --git a/...a.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/primitives/impl/ControlPrimitives.java b/...a.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/primitives/impl/ControlPrimitives.java
@@ -646,6 +646,7 @@ protected abstract static class PrimFlushCacheByMethodNode extends AbstractPrimi
         @Specialization(guards = "receiver.hasMethodClass(readNode)")
         protected final CompiledCodeObject doFlush(final CompiledCodeObject receiver,
                         @CachedContext(SqueakLanguage.class) final SqueakImageContext image) {
+            receiver.flushCache();
             image.flushMethodCacheForMethod(receiver);
             /*
              * TODO: maybe the method's callTarget could be invalidated to remove it from any PIC