Mercurial > hg > graal-compiler

changeset 13707:40fd9958cdf5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
SL: required fixes for moving FrameDescriptor to the RootNode.
author Christian Humer <christian.humer@gmail.com>
date Fri, 17 Jan 2014 17:10:46 +0100
parents 232eb6708943
children 0fbe961a32df
files graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/FunctionRootNode.java
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/FunctionRootNode.java	Mon Jan 20 13:44:54 2014 +0100
+++ b/graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/FunctionRootNode.java	Fri Jan 17 17:10:46 2014 +0100
@@ -37,8 +37,8 @@
     private final String name;
     private final boolean inlineImmediatly;
 
-    private FunctionRootNode(TypedNode body, String name, boolean inlineImmediatly) {
-        super(null);
+    private FunctionRootNode(FrameDescriptor frameDescriptor, TypedNode body, String name, boolean inlineImmediatly) {
+        super(null, frameDescriptor);
         this.uninitializedBody = NodeUtil.cloneNode(body);
         this.body = adoptChild(body);
         this.name = name;
@@ -52,14 +52,14 @@
             arguments[i] = new ReadArgumentNode(i);
         }
         BuiltinNode buitinBody = factory.createNode(arguments, context);
-        FunctionRootNode root = new FunctionRootNode(buitinBody, name, true);
+        FunctionRootNode root = new FunctionRootNode(new FrameDescriptor(), buitinBody, name, true);
         return Truffle.getRuntime().createCallTarget(root);
     }
 
     public static CallTarget createFunction(StatementNode body, FrameDescriptor frameDescriptor, String name, TypedNode returnValue, String[] parameterNames) {
         FunctionBodyNode bodyContainer = new FunctionBodyNode(frameDescriptor, body, returnValue, parameterNames);
-        FunctionRootNode root = new FunctionRootNode(bodyContainer, name, false);
-        return Truffle.getRuntime().createCallTarget(root, frameDescriptor);
+        FunctionRootNode root = new FunctionRootNode(frameDescriptor, bodyContainer, name, false);
+        return Truffle.getRuntime().createCallTarget(root);
     }
 
     @Override