create the call target for code lazily

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java

@@ -171,6 +171,7 @@
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.nodes.UnexpectedResultException;
 import com.oracle.truffle.api.profiles.ConditionProfile;
+import com.oracle.truffle.api.profiles.ValueProfile;
 import com.oracle.truffle.api.source.Source;
 
 @CoreFunctions(defineModule = "builtins")
@@ -488,33 +489,37 @@ public Object eval(VirtualFrame frame, String expression, @SuppressWarnings("unu
         }
 
         @Specialization
-        public Object eval(VirtualFrame frame, PCode code, @SuppressWarnings("unused") PNone globals, @SuppressWarnings("unused") PNone locals) {
+        public Object eval(VirtualFrame frame, PCode code, @SuppressWarnings("unused") PNone globals, @SuppressWarnings("unused") PNone locals,
+                        @Cached("createIdentityProfile()") ValueProfile constantCt) {
             Frame callerFrame = readCallerFrameNode.executeWith(frame);
             PythonObject callerGlobals = PArguments.getGlobals(callerFrame);
             PCell[] callerClosure = PArguments.getClosure(callerFrame);
-            return evalExpression(code, callerGlobals, callerGlobals, callerClosure);
+            return evalExpression(constantCt.profile(code.getRootCallTarget()), callerGlobals, callerGlobals, callerClosure);
         }
 
         @Specialization
-        public Object eval(VirtualFrame frame, PCode code, PythonObject globals, @SuppressWarnings("unused") PNone locals) {
+        public Object eval(VirtualFrame frame, PCode code, PythonObject globals, @SuppressWarnings("unused") PNone locals,
+                        @Cached("createIdentityProfile()") ValueProfile constantCt) {
             Frame callerFrame = readCallerFrameNode.executeWith(frame);
             PCell[] callerClosure = PArguments.getClosure(callerFrame);
-            return evalExpression(code, globals, globals, callerClosure);
+            return evalExpression(constantCt.profile(code.getRootCallTarget()), globals, globals, callerClosure);
         }
 
         @Specialization
-        public Object eval(VirtualFrame frame, PCode code, PythonObject globals, PythonObject locals) {
+        public Object eval(VirtualFrame frame, PCode code, PythonObject globals, PythonObject locals,
+                        @Cached("createIdentityProfile()") ValueProfile constantCt) {
             Frame callerFrame = readCallerFrameNode.executeWith(frame);
             PCell[] callerClosure = PArguments.getClosure(callerFrame);
-            return evalExpression(code, globals, locals, callerClosure);
+            return evalExpression(constantCt.profile(code.getRootCallTarget()), globals, locals, callerClosure);
         }
 
         @Specialization
-        public Object eval(VirtualFrame frame, PCode code, @SuppressWarnings("unused") PNone globals, PythonObject locals) {
+        public Object eval(VirtualFrame frame, PCode code, @SuppressWarnings("unused") PNone globals, PythonObject locals,
+                        @Cached("createIdentityProfile()") ValueProfile constantCt) {
             Frame callerFrame = readCallerFrameNode.executeWith(frame);
             PythonObject callerGlobals = PArguments.getGlobals(callerFrame);
             PCell[] callerClosure = PArguments.getClosure(callerFrame);
-            return evalExpression(code, callerGlobals, locals, callerClosure);
+            return evalExpression(constantCt.profile(code.getRootCallTarget()), callerGlobals, locals, callerClosure);
         }
 
         @Specialization
@@ -551,8 +556,8 @@ private byte[] getByteArray(PIBytesLike pByteArray) {
         }
 
         @TruffleBoundary
-        private static Object evalExpression(PCode code, PythonObject globals, PythonObject locals, PCell[] closure) {
-            return evalNode(code.getRootCallTarget(), globals, locals, closure);
+        private static Object evalExpression(RootCallTarget ct, PythonObject globals, PythonObject locals, PCell[] closure) {
+            return evalNode(ct, globals, locals, closure);
         }
 
         @TruffleBoundary

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

@@ -58,6 +58,7 @@
 import com.oracle.graal.python.nodes.generator.GeneratorFunctionRootNode;
 import com.oracle.graal.python.runtime.PythonCore;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.nodes.Node;
@@ -70,7 +71,8 @@ public final class PCode extends PythonBuiltinObject {
     private final long FLAG_POS_VAR_ARGS = 2;
     private final long FLAG_POS_VAR_KW_ARGS = 3;
 
-    private final RootCallTarget callTarget;
+    private RootCallTarget callTarget = null;
+    private final RootNode rootNode;
     private final PythonCore core;
 
     // number of arguments (not including keyword only arguments, * or ** args)
@@ -114,7 +116,7 @@ public final class PCode extends PythonBuiltinObject {
     public PCode(LazyPythonClass cls, RootNode rootNode, PythonCore core) {
         super(cls);
         assert rootNode != null;
-        this.callTarget = Truffle.getRuntime().createCallTarget(rootNode);
+        this.rootNode = rootNode;
         this.core = core;
     }
 
@@ -125,7 +127,7 @@ public PCode(LazyPythonClass cls, int argcount, int kwonlyargcount,
                     String filename, String name, int firstlineno,
                     byte[] lnotab) {
         super(cls);
-        this.callTarget = null;
+        this.rootNode = null;
         this.core = null;
 
         this.argcount = argcount;
@@ -294,7 +296,7 @@ private void extractArgStats() {
     }
 
     public RootNode getRootNode() {
-        return callTarget == null ? null : callTarget.getRootNode();
+        return rootNode;
     }
 
     private boolean hasRootNode() {
@@ -434,6 +436,10 @@ public Arity getArity() {
     }
 
     public RootCallTarget getRootCallTarget() {
+        if (rootNode != null && callTarget == null) {
+            CompilerDirectives.transferToInterpreter();
+            callTarget = Truffle.getRuntime().createCallTarget(rootNode);
+        }
         return callTarget;
     }
 }