1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/boot-truffle/src/main/java/net/java/html/boot/truffle/FnRootNode.java	Sat Jul 02 09:35:05 2016 +0200
     1.3 @@ -0,0 +1,80 @@
     1.4 +/**
     1.5 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
     1.6 + *
     1.7 + * Copyright 2013-2014 Oracle and/or its affiliates. All rights reserved.
     1.8 + *
     1.9 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
    1.10 + * Other names may be trademarks of their respective owners.
    1.11 + *
    1.12 + * The contents of this file are subject to the terms of either the GNU
    1.13 + * General Public License Version 2 only ("GPL") or the Common
    1.14 + * Development and Distribution License("CDDL") (collectively, the
    1.15 + * "License"). You may not use this file except in compliance with the
    1.16 + * License. You can obtain a copy of the License at
    1.17 + * http://www.netbeans.org/cddl-gplv2.html
    1.18 + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
    1.19 + * specific language governing permissions and limitations under the
    1.20 + * License.  When distributing the software, include this License Header
    1.21 + * Notice in each file and include the License file at
    1.22 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
    1.23 + * particular file as subject to the "Classpath" exception as provided
    1.24 + * by Oracle in the GPL Version 2 section of the License file that
    1.25 + * accompanied this code. If applicable, add the following below the
    1.26 + * License Header, with the fields enclosed by brackets [] replaced by
    1.27 + * your own identifying information:
    1.28 + * "Portions Copyrighted [year] [name of copyright owner]"
    1.29 + *
    1.30 + * Contributor(s):
    1.31 + *
    1.32 + * The Original Software is NetBeans. The Initial Developer of the Original
    1.33 + * Software is Oracle. Portions Copyright 2013-2014 Oracle. All Rights Reserved.
    1.34 + *
    1.35 + * If you wish your version of this file to be governed by only the CDDL
    1.36 + * or only the GPL Version 2, indicate your decision by adding
    1.37 + * "[Contributor] elects to include this software in this distribution
    1.38 + * under the [CDDL or GPL Version 2] license." If you do not indicate a
    1.39 + * single choice of license, a recipient has the option to distribute
    1.40 + * your version of this file under either the CDDL, the GPL Version 2 or
    1.41 + * to extend the choice of license to its licensees as provided above.
    1.42 + * However, if you add GPL Version 2 code and therefore, elected the GPL
    1.43 + * Version 2 license, then the option applies only if the new code is
    1.44 + * made subject to such option by the copyright holder.
    1.45 + */
    1.46 +package net.java.html.boot.truffle;
    1.47 +
    1.48 +import com.oracle.truffle.api.TruffleLanguage;
    1.49 +import com.oracle.truffle.api.frame.VirtualFrame;
    1.50 +import com.oracle.truffle.api.interop.ForeignAccess;
    1.51 +import com.oracle.truffle.api.interop.InteropException;
    1.52 +import com.oracle.truffle.api.interop.Message;
    1.53 +import com.oracle.truffle.api.interop.TruffleObject;
    1.54 +import com.oracle.truffle.api.nodes.Node;
    1.55 +import com.oracle.truffle.api.nodes.RootNode;
    1.56 +
    1.57 +final class FnRootNode extends RootNode {
    1.58 +    @Child
    1.59 +    private Node execute;
    1.60 +    private final TruffleObject fn;
    1.61 +
    1.62 +    FnRootNode(TruffleObject fn, int arity) {
    1.63 +        super(TruffleLanguage.class, null, null);
    1.64 +        // one more argument for this
    1.65 +        this.execute = Message.createExecute(arity + 1).createNode();
    1.66 +        this.fn = fn;
    1.67 +    }
    1.68 +
    1.69 +    @Override
    1.70 +    public Object execute(VirtualFrame frame) {
    1.71 +        try {
    1.72 +            final Object[] args = frame.getArguments();
    1.73 +            Object result = ForeignAccess.sendExecute(execute, frame, fn, args);
    1.74 +            return result;
    1.75 +        } catch (InteropException ex) {
    1.76 +            throw raise(RuntimeException.class, ex);
    1.77 +        }
    1.78 +    }
    1.79 +
    1.80 +    private static <E extends Throwable> E raise(Class<E> castTo, Throwable t) throws E {
    1.81 +        throw (E)t;
    1.82 +    }
    1.83 +}

     2.1 --- a/boot-truffle/src/main/java/net/java/html/boot/truffle/TrufflePresenter.java	Sat Jul 02 08:40:14 2016 +0200
     2.2 +++ b/boot-truffle/src/main/java/net/java/html/boot/truffle/TrufflePresenter.java	Sat Jul 02 09:35:05 2016 +0200
     2.3 @@ -43,6 +43,7 @@
     2.4  package net.java.html.boot.truffle;
     2.5  
     2.6  import com.oracle.truffle.api.CallTarget;
     2.7 +import com.oracle.truffle.api.Truffle;
     2.8  import com.oracle.truffle.api.TruffleLanguage;
     2.9  import com.oracle.truffle.api.interop.TruffleObject;
    2.10  import com.oracle.truffle.api.interop.java.JavaInterop;
    2.11 @@ -103,7 +104,7 @@
    2.12          sb.append("})()\n");
    2.13  
    2.14          TruffleObject fn = (TruffleObject) getEval().eval(sb.toString());
    2.15 -        return new FnImpl(this, fn, keepAlive);
    2.16 +        return new FnImpl(this, fn, names.length);
    2.17      }
    2.18  
    2.19      @Override
    2.20 @@ -241,10 +242,10 @@
    2.21          private final CallTarget fn;
    2.22          private final boolean[] keepAlive;
    2.23  
    2.24 -        public FnImpl(Presenter presenter, TruffleObject fn, boolean[] keepAlive) {
    2.25 +        public FnImpl(Presenter presenter, TruffleObject fn, int arity) {
    2.26              super(presenter);
    2.27 -            this.fn = JavaInterop.asJavaFunction(CallTarget.class, fn);
    2.28 -            this.keepAlive = keepAlive;
    2.29 +            this.fn = Truffle.getRuntime().createCallTarget(new FnRootNode(fn, arity));
    2.30 +            this.keepAlive = null;
    2.31          }
    2.32  
    2.33          @Override