Mercurial > hg > graal-compiler
changeset 14719:0bdd0d157040
fix vargs -> Object -> vargs logging call paths
author | Tom Rodriguez <tom.rodriguez@oracle.com> |
---|---|
date | Fri, 21 Mar 2014 16:36:59 -0700 |
parents | 25359cbb95e3 |
children | af7b9b9a9a28 92aa6797d639 |
files | graal/com.oracle.graal.debug/src/com/oracle/graal/debug/Debug.java graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningUtil.java graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/IterativeInliningPhase.java graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/VirtualUtil.java |
diffstat | 4 files changed, 19 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/Debug.java Fri Mar 21 15:28:37 2014 -0700 +++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/Debug.java Fri Mar 21 16:36:59 2014 -0700 @@ -371,6 +371,17 @@ } /** + * This override exists the catch cases when log is called with one argument from a method which + * is vararg. It will bind to this method instead of the single arg variant and produce a + * deprecation warning instead of silently wrapping the Object[] inside of another Object[]. + */ + @Deprecated + public static void log(String format, Object[] args) { + assert false : "shouldn't use this"; + logv(format, args); + } + + /** * The same as {@link #log}, but without line termination and without indentation. */ public static void printf(String msg, Object... args) {
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningUtil.java Fri Mar 21 15:28:37 2014 -0700 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningUtil.java Fri Mar 21 16:36:59 2014 -0700 @@ -173,7 +173,10 @@ public static void logInliningDecision(final String msg, final Object... args) { try (Scope s = Debug.scope(inliningDecisionsScopeString)) { - Debug.logv(msg, args); + // Can't use log here since we are varargs + if (Debug.isLogEnabled()) { + Debug.logv(msg, args); + } } }
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/IterativeInliningPhase.java Fri Mar 21 15:28:37 2014 -0700 +++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/IterativeInliningPhase.java Fri Mar 21 16:36:59 2014 -0700 @@ -42,8 +42,8 @@ } public static final void trace(String format, Object... obj) { - if (TraceEscapeAnalysis.getValue()) { - Debug.log(format, obj); + if (TraceEscapeAnalysis.getValue() && Debug.isLogEnabled()) { + Debug.logv(format, obj); } }
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/VirtualUtil.java Fri Mar 21 15:28:37 2014 -0700 +++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/VirtualUtil.java Fri Mar 21 16:36:59 2014 -0700 @@ -109,8 +109,8 @@ } public static void trace(String format, Object... obj) { - if (TraceEscapeAnalysis.getValue()) { - Debug.log(format, obj); + if (TraceEscapeAnalysis.getValue() && Debug.isLogEnabled()) { + Debug.logv(format, obj); } }