diff graal/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultCallNode.java @ 15091:607e33885130

Truffle: Merge context sensitive inlining removal with stack trace support.
author Christian Humer <christian.humer@gmail.com>
date Mon, 14 Apr 2014 18:46:56 +0200
parents 448338c9ce96
children
line wrap: on
line diff
--- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultCallNode.java	Mon Apr 14 18:25:23 2014 +0200
+++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultCallNode.java	Mon Apr 14 18:46:56 2014 +0200
@@ -42,19 +42,7 @@
 
     @Override
     public Object call(VirtualFrame frame, Object[] arguments) {
-        return callProxy(this, getCurrentCallTarget(), frame, arguments);
-    }
-
-    public static Object callProxy(MaterializedFrameNotify notify, CallTarget callTarget, VirtualFrame frame, Object[] arguments) {
-        try {
-            if (notify.getOutsideFrameAccess() != FrameAccess.NONE) {
-                CompilerDirectives.materialize(frame);
-            }
-            return callTarget.call(arguments);
-        } finally {
-            // this assertion is needed to keep the values from being cleared as non-live locals
-            assert notify != null & callTarget != null & frame != null;
-        }
+        return getCurrentCallTarget().call(arguments);
     }
 
     @Override