Mercurial > hg > truffle

changeset 15383:b14d85af515f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplify FrameInstance (remove getTargetCallTarget)
author Lukas Stadler <lukas.stadler@oracle.com>
date Fri, 25 Apr 2014 11:15:21 +0200
parents 279898d12346
children 7cddd549579a
files graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/HotSpotFrameInstance.java graal/com.oracle.truffle.api/src/com/oracle/truffle/api/frame/FrameInstance.java
diffstat 2 files changed, 5 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/HotSpotFrameInstance.java	Thu Apr 24 17:35:21 2014 +0200
+++ b/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/HotSpotFrameInstance.java	Fri Apr 25 11:15:21 2014 +0200
@@ -88,13 +88,12 @@
 
     public abstract CallTarget getTargetCallTarget();
 
-    public DirectCallNode getCallNode() {
+    public Node getCallNode() {
         Object receiver = stackFrame.getLocal(getNotifyIndex());
-        if (receiver instanceof DirectCallNode) {
-            return (DirectCallNode) receiver;
-        } else {
-            return null;
+        if (receiver instanceof DirectCallNode || receiver instanceof IndirectCallNode) {
+            return (Node) receiver;
         }
+        return null;
     }
 
     /**
--- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/frame/FrameInstance.java	Thu Apr 24 17:35:21 2014 +0200
+++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/frame/FrameInstance.java	Fri Apr 25 11:15:21 2014 +0200
@@ -40,9 +40,7 @@
 
     boolean isVirtualFrame();
 
-    DirectCallNode getCallNode();
+    Node getCallNode();
 
     CallTarget getCallTarget();
-
-    CallTarget getTargetCallTarget();
 }