# HG changeset patch
# User Jaroslav Tulach <jtulach@netbeans.org>
# Date 1467444905 -7200
# Node ID 28e373ac1576b29932bb6956c7daddf224b4d853
# Parent  1dbcc395b2e5a34c6ace801fe334f18f22184577
Run most of the tests against GraalVM 0.12 successfully

diff -r 1dbcc395b2e5 -r 28e373ac1576 boot-truffle/src/main/java/net/java/html/boot/truffle/FnRootNode.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/boot-truffle/src/main/java/net/java/html/boot/truffle/FnRootNode.java	Sat Jul 02 09:35:05 2016 +0200
@@ -0,0 +1,80 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2013-2014 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2014 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package net.java.html.boot.truffle;
+
+import com.oracle.truffle.api.TruffleLanguage;
+import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.interop.ForeignAccess;
+import com.oracle.truffle.api.interop.InteropException;
+import com.oracle.truffle.api.interop.Message;
+import com.oracle.truffle.api.interop.TruffleObject;
+import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.api.nodes.RootNode;
+
+final class FnRootNode extends RootNode {
+    @Child
+    private Node execute;
+    private final TruffleObject fn;
+
+    FnRootNode(TruffleObject fn, int arity) {
+        super(TruffleLanguage.class, null, null);
+        // one more argument for this
+        this.execute = Message.createExecute(arity + 1).createNode();
+        this.fn = fn;
+    }
+
+    @Override
+    public Object execute(VirtualFrame frame) {
+        try {
+            final Object[] args = frame.getArguments();
+            Object result = ForeignAccess.sendExecute(execute, frame, fn, args);
+            return result;
+        } catch (InteropException ex) {
+            throw raise(RuntimeException.class, ex);
+        }
+    }
+
+    private static <E extends Throwable> E raise(Class<E> castTo, Throwable t) throws E {
+        throw (E)t;
+    }
+}
diff -r 1dbcc395b2e5 -r 28e373ac1576 boot-truffle/src/main/java/net/java/html/boot/truffle/TrufflePresenter.java
--- a/boot-truffle/src/main/java/net/java/html/boot/truffle/TrufflePresenter.java	Sat Jul 02 08:40:14 2016 +0200
+++ b/boot-truffle/src/main/java/net/java/html/boot/truffle/TrufflePresenter.java	Sat Jul 02 09:35:05 2016 +0200
@@ -43,6 +43,7 @@
 package net.java.html.boot.truffle;
 
 import com.oracle.truffle.api.CallTarget;
+import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.interop.TruffleObject;
 import com.oracle.truffle.api.interop.java.JavaInterop;
@@ -103,7 +104,7 @@
         sb.append("})()\n");
 
         TruffleObject fn = (TruffleObject) getEval().eval(sb.toString());
-        return new FnImpl(this, fn, keepAlive);
+        return new FnImpl(this, fn, names.length);
     }
 
     @Override
@@ -241,10 +242,10 @@
         private final CallTarget fn;
         private final boolean[] keepAlive;
 
-        public FnImpl(Presenter presenter, TruffleObject fn, boolean[] keepAlive) {
+        public FnImpl(Presenter presenter, TruffleObject fn, int arity) {
             super(presenter);
-            this.fn = JavaInterop.asJavaFunction(CallTarget.class, fn);
-            this.keepAlive = keepAlive;
+            this.fn = Truffle.getRuntime().createCallTarget(new FnRootNode(fn, arity));
+            this.keepAlive = null;
         }
 
         @Override