# HG changeset patch # User Doug Simon # Date 1395315762 -3600 # Node ID 733e50d96f9b2ce2a05b28a8722606fdaa64a7d4 # Parent 186e57fa5eaa26368a53b6754817eb390103812b fixed usages of Debug.log() diff -r 186e57fa5eaa -r 733e50d96f9b graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/ForEachToGraal.java --- a/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/ForEachToGraal.java Thu Mar 20 12:37:43 2014 +0100 +++ b/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/ForEachToGraal.java Thu Mar 20 12:42:42 2014 +0100 @@ -82,7 +82,7 @@ NodeIterable calls = graph.getNodes(MethodCallTargetNode.class); assert calls.count() == 1; ResolvedJavaMethod lambdaMethod = calls.first().targetMethod(); - Debug.log("target ... " + lambdaMethod); + Debug.log("target ... %s", lambdaMethod); if (lambdaMethod == null) { Debug.log("Did not find call in accept()"); @@ -115,7 +115,7 @@ getHSAILBackend().executeKernel(code, jobSize, args); return true; } catch (InvalidInstalledCodeException iice) { - Debug.log("WARNING: Invalid installed code at exec time." + iice); + Debug.log("WARNING: Invalid installed code at exec time: %s", iice); iice.printStackTrace(); return false; } diff -r 186e57fa5eaa -r 733e50d96f9b graal/com.oracle.graal.java/src/com/oracle/graal/java/BciBlockMapping.java --- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/BciBlockMapping.java Thu Mar 20 12:37:43 2014 +0100 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/BciBlockMapping.java Thu Mar 20 12:42:42 2014 +0100 @@ -612,7 +612,7 @@ } sb.append(n); } - Debug.log(sb.toString()); + Debug.log("%s", sb); } } diff -r 186e57fa5eaa -r 733e50d96f9b graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java --- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java Thu Mar 20 12:37:43 2014 +0100 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java Thu Mar 20 12:42:42 2014 +0100 @@ -2098,7 +2098,7 @@ if (!currentBlock.jsrScope.isEmpty()) { sb.append(' ').append(currentBlock.jsrScope); } - Debug.log(sb.toString()); + Debug.log("%s", sb); } } diff -r 186e57fa5eaa -r 733e50d96f9b graal/com.oracle.graal.loop/src/com/oracle/graal/loop/LoopEx.java --- a/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/LoopEx.java Thu Mar 20 12:37:43 2014 +0100 +++ b/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/LoopEx.java Thu Mar 20 12:42:42 2014 +0100 @@ -141,7 +141,7 @@ BinaryNode result = BinaryNode.reassociate(binary, invariant); if (result != binary) { if (Debug.isLogEnabled()) { - Debug.log(MetaUtil.format("%H::%n", Debug.contextLookup(ResolvedJavaMethod.class)) + " : Reassociated %s into %s", binary, result); + Debug.log("%s : Reassociated %s into %s", MetaUtil.format("%H::%n", Debug.contextLookup(ResolvedJavaMethod.class)), binary, result); } graph.replaceFloating(binary, result); } diff -r 186e57fa5eaa -r 733e50d96f9b graal/com.oracle.graal.loop/src/com/oracle/graal/loop/phases/LoopTransformLowPhase.java --- a/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/phases/LoopTransformLowPhase.java Thu Mar 20 12:37:43 2014 +0100 +++ b/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/phases/LoopTransformLowPhase.java Thu Mar 20 12:42:42 2014 +0100 @@ -84,6 +84,6 @@ } } sb.append("]"); - Debug.log(sb.toString()); + Debug.log("%s", sb); } } diff -r 186e57fa5eaa -r 733e50d96f9b graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ReplacementsImpl.java --- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ReplacementsImpl.java Thu Mar 20 12:37:43 2014 +0100 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ReplacementsImpl.java Thu Mar 20 12:42:42 2014 +0100 @@ -233,7 +233,9 @@ } else { original = metaAccess.lookupJavaConstructor((Constructor) originalMember); } - Debug.log("substitution: " + MetaUtil.format("%H.%n(%p) %r", original) + " --> " + MetaUtil.format("%H.%n(%p) %r", substitute)); + if (Debug.isLogEnabled()) { + Debug.log("substitution: %s --> %s", MetaUtil.format("%H.%n(%p) %r", original), MetaUtil.format("%H.%n(%p) %r", substitute)); + } registeredMethodSubstitutions.put(original, substitute); return original;