Mercurial > hg > graal-compiler
changeset 14708:0f73f8b75b81
printing fixes
author | Tom Rodriguez <tom.rodriguez@oracle.com> |
---|---|
date | Thu, 20 Mar 2014 16:56:21 -0700 |
parents | 6ce6c4ccba8f |
children | d3225562f0d8 |
files | graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/Interval.java graal/com.oracle.graal.loop/src/com/oracle/graal/loop/LoopEx.java graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningUtil.java |
diffstat | 3 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/Interval.java Thu Mar 20 15:57:03 2014 -0700 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/Interval.java Thu Mar 20 16:56:21 2014 -0700 @@ -1179,7 +1179,9 @@ String to = "?"; if (first != null && first != Range.EndMarker) { from = String.valueOf(from()); - to = String.valueOf(to()); + // to() may cache a computed value, modifying the current object, which is a bad idea + // for a printing function. Compute it directly instead. + to = String.valueOf(calcTo()); } String locationString = this.location == null ? "" : "@" + this.location; return operandNumber + ":" + operand + (isRegister(operand) ? "" : locationString) + "[" + from + "," + to + "]";
--- a/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/LoopEx.java Thu Mar 20 15:57:03 2014 -0700 +++ b/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/LoopEx.java Thu Mar 20 16:56:21 2014 -0700 @@ -141,7 +141,7 @@ BinaryNode result = BinaryNode.reassociate(binary, invariant); if (result != binary) { if (Debug.isLogEnabled()) { - Debug.log("%s : Reassociated %s into %s", MetaUtil.format("%H::%n", Debug.contextLookup(ResolvedJavaMethod.class)), binary, result); + Debug.log("%s : Reassociated %s into %s", MetaUtil.format("%H::%n", graph.method()), binary, result); } graph.replaceFloating(binary, result); }
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningUtil.java Thu Mar 20 15:57:03 2014 -0700 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningUtil.java Thu Mar 20 16:56:21 2014 -0700 @@ -173,7 +173,7 @@ public static void logInliningDecision(final String msg, final Object... args) { try (Scope s = Debug.scope(inliningDecisionsScopeString)) { - Debug.log(msg, args); + Debug.logv(msg, args); } }