Mercurial > hg > truffle

changeset 11686:13b3c8cd5e52

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Andreas Woess <andreas.woess@jku.at>
date Tue, 17 Sep 2013 22:33:51 +0200
parents 7e661dbea359 (current diff) 7a987d8147c2 (diff)
children facb442de5db 226ef8ab5bc0
files
diffstat 2 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTarget.java	Tue Sep 17 22:03:47 2013 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTarget.java	Tue Sep 17 22:33:51 2013 +0200
@@ -76,6 +76,10 @@
 
     @Override
     public Object call(PackedFrame caller, Arguments args) {
+        return callHelper(caller, args);
+    }
+
+    private Object callHelper(PackedFrame caller, Arguments args) {
         if (TruffleCallTargetProfiling.getValue()) {
             callCount++;
         }
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/substitutions/OptimizedCallTargetSubstitutions.java	Tue Sep 17 22:03:47 2013 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/substitutions/OptimizedCallTargetSubstitutions.java	Tue Sep 17 22:33:51 2013 +0200
@@ -34,6 +34,9 @@
 public class OptimizedCallTargetSubstitutions {
 
     @MacroSubstitution(macro = NeverInlineMacroNode.class, isStatic = false)
+    public static native Object callHelper(OptimizedCallTarget target, PackedFrame caller, Arguments args);
+
+    @MacroSubstitution(macro = NeverInlineMacroNode.class, isStatic = false)
     public static native Object interpreterCall(OptimizedCallTarget target, PackedFrame caller, Arguments args);
 
     @MacroSubstitution(macro = NeverInlineMacroNode.class, isStatic = false)