[GR-46135] Fix PE bug in CodeNodes.

PullRequest: graalpython/2783

Author: steve-s

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/code/CodeNodes.java

@@ -229,15 +229,14 @@ public abstract static class GetCodeSignatureNode extends PNodeWithContext {
 
         @Specialization(guards = {"cachedCode == code", "isSingleContext(inliningTarget)"}, limit = "2")
         static Signature doCached(Node inliningTarget, @SuppressWarnings("unused") PCode code,
-                        @Cached("code") PCode cachedCode,
-                        @Cached InlinedBranchProfile firstExecution) {
-            return getInSingleContextMode(inliningTarget, cachedCode, firstExecution);
+                        @Cached("code") PCode cachedCode) {
+            return getInSingleContextMode(inliningTarget, cachedCode);
         }
 
         public static Signature getInSingleContextMode(Node inliningTarget, PFunction fun, InlinedBranchProfile firstExecution) {
             assert isSingleContext(inliningTarget);
-            if (CompilerDirectives.inCompiledCode() && CompilerDirectives.isPartialEvaluationConstant(fun) && fun.getCodeStableAssumption().isValid()) {
-                getInSingleContextMode(inliningTarget, fun.getCode(), firstExecution);
+            if (CompilerDirectives.inCompiledCode() && CompilerDirectives.isPartialEvaluationConstant(fun.getCode())) {
+                getInSingleContextMode(inliningTarget, fun.getCode());
             }
             PCode code = fun.getCode();
             Signature signature = code.signature;
@@ -249,12 +248,11 @@ public static Signature getInSingleContextMode(Node inliningTarget, PFunction fu
             return signature;
         }
 
-        public static Signature getInSingleContextMode(Node inliningTarget, PCode code, InlinedBranchProfile firstExecution) {
+        public static Signature getInSingleContextMode(Node inliningTarget, PCode code) {
             assert isSingleContext(inliningTarget);
             CompilerAsserts.partialEvaluationConstant(code);
-            if (!firstExecution.wasEntered(inliningTarget)) {
-                firstExecution.enter(inliningTarget);
-                CompilerDirectives.transferToInterpreter();
+            if (code.signature == null) {
+                CompilerDirectives.transferToInterpreterAndInvalidate();
                 code.initializeSignature(code.initializeCallTarget());
             }
             return code.signature;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/argument/CreateArgumentsNode.java

@@ -166,7 +166,6 @@ Object[] doFunctionCached(PFunction callable, Object[] userArguments, PKeyword[]
                     @Cached InlinedBranchProfile firstExecution,
                     @Cached(value = "callable", weak = true) @SuppressWarnings("unused") PFunction cachedCallable) {
 
-        PCode code = callable.getCode();
         Signature signature = CodeNodes.GetCodeSignatureNode.getInSingleContextMode(inliningTarget, callable, firstExecution);
         Object[] defaults = cachedCallable.getDefaults();
         PKeyword[] kwdefaults = cachedCallable.getKwDefaults();