Don't leak this in PBytecodeRootNode constructor

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java

@@ -496,7 +496,7 @@ private CallTarget parseForBytecodeInterpreter(ParsingRequest request) {
             if (internal && !source.isInternal()) {
                 source = Source.newBuilder(source).internal(true).build();
             }
-            PBytecodeRootNode rootNode = new PBytecodeRootNode(this, code, source, null);
+            PBytecodeRootNode rootNode = PBytecodeRootNode.create(this, code, source);
             return PythonUtils.getOrCreateCallTarget(rootNode);
         }
         for (int optimize = 0; optimize < MIME_TYPE_EVAL.length; optimize++) {
@@ -533,7 +533,7 @@ public RootCallTarget parseForBytecodeInterpreter(PythonContext context, Source
             }
             CompilationUnit cu = compiler.compile(mod, EnumSet.noneOf(Compiler.Flags.class), optimize);
             CodeUnit co = cu.assemble();
-            RootNode rootNode = new PBytecodeRootNode(this, co, source, errorCb);
+            RootNode rootNode = PBytecodeRootNode.create(this, co, source, errorCb);
             GilNode gil = GilNode.getUncached();
             boolean wasAcquired = gil.acquire(context, rootNode);
             if (topLevel) {

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

@@ -152,7 +152,7 @@ private RootCallTarget deserializeForBytecodeInterpreter(PythonLanguage language
                                 code.outputCanQuicken, code.variableShouldUnbox,
                                 code.generalizeInputsMap, code.generalizeVarsMap);
             }
-            RootNode rootNode = new PBytecodeRootNode(language, code, null, null);
+            RootNode rootNode = PBytecodeRootNode.create(language, code, null);
             if (code.isGeneratorOrCoroutine()) {
                 rootNode = new PBytecodeGeneratorFunctionRootNode(language, rootNode.getFrameDescriptor(), (PBytecodeRootNode) rootNode, code.name);
             }

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

@@ -614,7 +614,7 @@ private static Object convertConstantToPythonSpace(RootNode rootNode, Object o)
         PythonObjectFactory factory = PythonObjectFactory.getUncached();
         if (o instanceof CodeUnit) {
             CodeUnit code = ((CodeUnit) o);
-            PBytecodeRootNode bytecodeRootNode = new PBytecodeRootNode(PythonLanguage.get(rootNode), code, getSourceSection(rootNode).getSource(), null);
+            PBytecodeRootNode bytecodeRootNode = PBytecodeRootNode.create(PythonLanguage.get(rootNode), code, getSourceSection(rootNode).getSource());
             return factory.createCode(bytecodeRootNode.getCallTarget(), bytecodeRootNode.getSignature(), code);
         } else if (o instanceof BigInteger) {
             return factory.createInt((BigInteger) o);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode/MakeFunctionNode.java

@@ -144,7 +144,7 @@ int makeFunction(VirtualFrame frame, Object globals, int initialStackTop, int fl
 
     public static MakeFunctionNode create(PythonLanguage language, CodeUnit code, Source source) {
         RootCallTarget callTarget;
-        PBytecodeRootNode bytecodeRootNode = new PBytecodeRootNode(language, code, source, null);
+        PBytecodeRootNode bytecodeRootNode = PBytecodeRootNode.create(language, code, source);
         if (code.isGeneratorOrCoroutine()) {
             // TODO what should the frameDescriptor be? does it matter?
             callTarget = new PBytecodeGeneratorFunctionRootNode(language, bytecodeRootNode.getFrameDescriptor(), bytecodeRootNode, code.name).getCallTarget();

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode/PBytecodeRootNode.java

@@ -493,10 +493,10 @@ public final class PBytecodeRootNode extends PRootNode implements BytecodeOSRNod
     @CompilationFinal private boolean usingCachedNodes;
     @CompilationFinal(dimensions = 1) private int[] conditionProfiles;
 
-    private static FrameDescriptor makeFrameDescriptor(CodeUnit co) {
+    private static FrameDescriptor makeFrameDescriptor(CodeUnit co, FrameInfo info) {
         int capacity = co.varnames.length + co.cellvars.length + co.freevars.length + co.stacksize + 1;
         FrameDescriptor.Builder newBuilder = FrameDescriptor.newBuilder(capacity);
-        newBuilder.info(new FrameInfo());
+        newBuilder.info(info);
         // locals
         for (int i = 0; i < co.varnames.length; i++) {
             TruffleString varname = co.varnames[i];
@@ -544,14 +544,22 @@ private static Signature makeSignature(CodeUnit co) {
     }
 
     @TruffleBoundary
-    public PBytecodeRootNode(TruffleLanguage<?> language, CodeUnit co, Source source, RaisePythonExceptionErrorCallback parserErrorCallback) {
-        this(language, makeFrameDescriptor(co), makeSignature(co), co, source, parserErrorCallback);
+    public static PBytecodeRootNode create(TruffleLanguage<?> language, CodeUnit co, Source source) {
+        return create(language, co, source, null);
     }
 
     @TruffleBoundary
-    public PBytecodeRootNode(TruffleLanguage<?> language, FrameDescriptor fd, Signature sign, CodeUnit co, Source source, RaisePythonExceptionErrorCallback parserErrorCallback) {
+    public static PBytecodeRootNode create(TruffleLanguage<?> language, CodeUnit co, Source source, RaisePythonExceptionErrorCallback parserErrorCallback) {
+        FrameInfo frameInfo = new FrameInfo();
+        FrameDescriptor fd = makeFrameDescriptor(co, frameInfo);
+        PBytecodeRootNode rootNode = new PBytecodeRootNode(language, fd, makeSignature(co), co, source, parserErrorCallback);
+        frameInfo.rootNode = rootNode;
+        return rootNode;
+    }
+
+    @TruffleBoundary
+    private PBytecodeRootNode(TruffleLanguage<?> language, FrameDescriptor fd, Signature sign, CodeUnit co, Source source, RaisePythonExceptionErrorCallback parserErrorCallback) {
         super(language, fd);
-        ((FrameInfo) fd.getInfo()).rootNode = this;
         this.celloffset = co.varnames.length;
         this.freeoffset = celloffset + co.cellvars.length;
         this.stackoffset = freeoffset + co.freevars.length;