# HG changeset patch # User Andreas Woess # Date 1390302878 -3600 # Node ID 4281521dc39aad770533ee2b3ce08d8bd4ccf867 # Parent 8e6b47ee2f25db676ff4be8052c008552ed1f19c Truffle: fix non-local control flow using exceptions diff -r 8e6b47ee2f25 -r 4281521dc39a graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTarget.java --- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTarget.java Tue Jan 21 00:20:33 2014 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTarget.java Tue Jan 21 12:14:38 2014 +0100 @@ -71,6 +71,7 @@ } + @CompilerDirectives.SlowPath @Override public Object call(PackedFrame caller, Arguments args) { return callHelper(caller, args); diff -r 8e6b47ee2f25 -r 4281521dc39a graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/substitutions/OptimizedCallTargetSubstitutions.java --- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/substitutions/OptimizedCallTargetSubstitutions.java Tue Jan 21 00:20:33 2014 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/substitutions/OptimizedCallTargetSubstitutions.java Tue Jan 21 12:14:38 2014 +0100 @@ -34,9 +34,6 @@ public class OptimizedCallTargetSubstitutions { @MacroSubstitution(macro = NeverInlineMacroNode.class, isStatic = false) - public static native Object call(OptimizedCallTarget target, PackedFrame caller, Arguments args); - - @MacroSubstitution(macro = NeverInlineMacroNode.class, isStatic = false) public static native Object callHelper(OptimizedCallTarget target, PackedFrame caller, Arguments args); @MacroSubstitution(macro = NeverInlineMacroNode.class, isStatic = false)