diff graal/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultDirectCallNode.java @ 17149:0a35e2789735

Truffle: remove unnecessary DefaultTruffleRuntime fields
author Andreas Woess <andreas.woess@jku.at>
date Wed, 17 Sep 2014 20:57:20 +0200
parents a3b0ecef8a15
children e3dd05527c2f
line wrap: on
line diff
--- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultDirectCallNode.java	Thu Sep 18 12:28:11 2014 +0200
+++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultDirectCallNode.java	Wed Sep 17 20:57:20 2014 +0200
@@ -34,16 +34,14 @@
 public final class DefaultDirectCallNode extends DirectCallNode {
 
     private boolean inliningForced;
-    private final DefaultTruffleRuntime defaultTruffleRuntime;
 
-    public DefaultDirectCallNode(CallTarget target, DefaultTruffleRuntime defaultTruffleRuntime) {
+    public DefaultDirectCallNode(CallTarget target) {
         super(target);
-        this.defaultTruffleRuntime = defaultTruffleRuntime;
     }
 
     @Override
     public Object call(final VirtualFrame frame, Object[] arguments) {
-        final CallTarget currentCallTarget = defaultTruffleRuntime.getCurrentFrame().getCallTarget();
+        final CallTarget currentCallTarget = defaultTruffleRuntime().getCurrentFrame().getCallTarget();
         FrameInstance frameInstance = new FrameInstance() {
 
             public Frame getFrame(FrameAccess access, boolean slowPath) {
@@ -62,11 +60,11 @@
                 return currentCallTarget;
             }
         };
-        defaultTruffleRuntime.pushFrame(frameInstance);
+        defaultTruffleRuntime().pushFrame(frameInstance);
         try {
             return getCurrentCallTarget().call(arguments);
         } finally {
-            defaultTruffleRuntime.popFrame();
+            defaultTruffleRuntime().popFrame();
         }
     }
 
@@ -109,4 +107,8 @@
     public String toString() {
         return (getParent() != null ? getParent().toString() : super.toString()) + " call " + getCurrentCallTarget().toString();
     }
+
+    private static DefaultTruffleRuntime defaultTruffleRuntime() {
+        return (DefaultTruffleRuntime) Truffle.getRuntime();
+    }
 }