Fixed uncached IndirectCallData

otethal · otethal · commit c3db7c62cd38 · 2023-11-20T11:49:48.000+01:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/IndirectCallData.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/IndirectCallData.java
@@ -59,6 +59,8 @@ public final class IndirectCallData {
 
     private IndirectCallData() {
         this.nodeRef = new TruffleWeakReference<>(null);
+        nativeCodeDoesntNeedMyFrame = Assumption.ALWAYS_VALID;
+        nativeCodeDoesntNeedExceptionState = Assumption.ALWAYS_VALID;
     }
 
     public IndirectCallData(Node node) {
@@ -124,7 +126,6 @@ public static void setEncapsulatingNeedsToPassExceptionState(Node callNode) {
     }
 
     private Assumption needNotPassFrameAssumption() {
-        assert !isUncached();
         if (nativeCodeDoesntNeedMyFrame == null) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
             nativeCodeDoesntNeedMyFrame = Truffle.getRuntime().createAssumption();
@@ -133,7 +134,6 @@ private Assumption needNotPassFrameAssumption() {
     }
 
     private Assumption needNotPassExceptionAssumption() {
-        assert !isUncached();
         if (nativeCodeDoesntNeedExceptionState == null) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
             nativeCodeDoesntNeedExceptionState = Truffle.getRuntime().createAssumption();

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,8 @@ public final class IndirectCallData {`
`59`	`59`
`60`	`60`	`private IndirectCallData() {`
`61`	`61`	`this.nodeRef = new TruffleWeakReference<>(null);`
	`62`	`+ nativeCodeDoesntNeedMyFrame = Assumption.ALWAYS_VALID;`
	`63`	`+ nativeCodeDoesntNeedExceptionState = Assumption.ALWAYS_VALID;`
`62`	`64`	`}`
`63`	`65`
`64`	`66`	`public IndirectCallData(Node node) {`
`@@ -124,7 +126,6 @@ public static void setEncapsulatingNeedsToPassExceptionState(Node callNode) {`
`124`	`126`	`}`
`125`	`127`
`126`	`128`	`private Assumption needNotPassFrameAssumption() {`
`127`		`- assert !isUncached();`
`128`	`129`	`if (nativeCodeDoesntNeedMyFrame == null) {`
`129`	`130`	`CompilerDirectives.transferToInterpreterAndInvalidate();`
`130`	`131`	`nativeCodeDoesntNeedMyFrame = Truffle.getRuntime().createAssumption();`
`@@ -133,7 +134,6 @@ private Assumption needNotPassFrameAssumption() {`
`133`	`134`	`}`
`134`	`135`
`135`	`136`	`private Assumption needNotPassExceptionAssumption() {`
`136`		`- assert !isUncached();`
`137`	`137`	`if (nativeCodeDoesntNeedExceptionState == null) {`
`138`	`138`	`CompilerDirectives.transferToInterpreterAndInvalidate();`
`139`	`139`	`nativeCodeDoesntNeedExceptionState = Truffle.getRuntime().createAssumption();`