changeset 18310:36fb9592c13b

Truffle: simpler, more consistent toString for DirectCallNode subclasses.
author Chris Seaton <chris.seaton@oracle.com>
date Sat, 08 Nov 2014 22:22:00 +0000
parents d079b2af3a15
children 3343ed66de79
files graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedDirectCallNode.java graal/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultDirectCallNode.java graal/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/DirectCallNode.java
diffstat 3 files changed, 6 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedDirectCallNode.java	Sat Nov 08 22:03:36 2014 +0000
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedDirectCallNode.java	Sat Nov 08 22:22:00 2014 +0000
@@ -173,8 +173,4 @@
         return true;
     }
 
-    @Override
-    public String toString() {
-        return String.format("OptimizedDirectCallNode(target=%s, parent=%s)", getCurrentCallTarget().toString(), getParent());
-    }
 }
--- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultDirectCallNode.java	Sat Nov 08 22:03:36 2014 +0000
+++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultDirectCallNode.java	Sat Nov 08 22:22:00 2014 +0000
@@ -98,11 +98,6 @@
         return false;
     }
 
-    @Override
-    public String toString() {
-        return (getParent() != null ? getParent().toString() : super.toString()) + " call " + getCurrentCallTarget().toString();
-    }
-
     private static DefaultTruffleRuntime defaultTruffleRuntime() {
         return (DefaultTruffleRuntime) Truffle.getRuntime();
     }
--- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/DirectCallNode.java	Sat Nov 08 22:03:36 2014 +0000
+++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/DirectCallNode.java	Sat Nov 08 22:22:00 2014 +0000
@@ -175,4 +175,10 @@
         }
         return null;
     }
+
+    @Override
+    public String toString() {
+        return String.format("%s(target=%s)", getClass().getSimpleName(), getCurrentCallTarget());
+    }
+
 }