# HG changeset patch # User Lukas Stadler # Date 1398417321 -7200 # Node ID b14d85af515f1edeb8d125aeb44649cac6a05655 # Parent 279898d123462fc009074594fa1c199d987dcdbf simplify FrameInstance (remove getTargetCallTarget) diff -r 279898d12346 -r b14d85af515f graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/HotSpotFrameInstance.java --- 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; } /** diff -r 279898d12346 -r b14d85af515f graal/com.oracle.truffle.api/src/com/oracle/truffle/api/frame/FrameInstance.java --- 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(); }