# HG changeset patch
# User Chris Seaton <chris.seaton@oracle.com>
# Date 1407276742 -3600
# Node ID 86a687ee6bf853cdfc83b9082785d1bf709f7578
# Parent  e0be8b8a9a85df1e3c2c2825ec29f672aa6e25e8# Parent  1ab64f590c88445735db53fc5fd903f2c2058b30
Merge.

diff -r e0be8b8a9a85 -r 86a687ee6bf8 graal/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultIndirectCallNode.java
--- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultIndirectCallNode.java	Tue Aug 05 22:22:43 2014 +0100
+++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultIndirectCallNode.java	Tue Aug 05 23:12:22 2014 +0100
@@ -32,10 +32,32 @@
  * This is runtime specific API. Do not use in a guest language.
  */
 final class DefaultIndirectCallNode extends IndirectCallNode {
+    @Override
+    public Object call(final VirtualFrame frame, final CallTarget target, Object[] arguments) {
+        DefaultTruffleRuntime truffleRuntime = (DefaultTruffleRuntime) Truffle.getRuntime();
+        final CallTarget currentCallTarget = truffleRuntime.getCurrentFrame().getCallTarget();
+        FrameInstance frameInstance = new FrameInstance() {
+            public Frame getFrame(FrameAccess access, boolean slowPath) {
+                return frame;
+            }
 
-    @Override
-    public Object call(VirtualFrame frame, CallTarget target, Object[] arguments) {
-        return target.call(arguments);
+            public boolean isVirtualFrame() {
+                return false;
+            }
+
+            public Node getCallNode() {
+                return DefaultIndirectCallNode.this;
+            }
+
+            public CallTarget getCallTarget() {
+                return currentCallTarget;
+            }
+        };
+        truffleRuntime.pushFrame(frameInstance);
+        try {
+            return target.call(arguments);
+        } finally {
+            truffleRuntime.popFrame();
+        }
     }
-
 }