# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1332334174 -3600
# Node ID 09f66048738e4e7cf6a0685c4eef69d05fb4da5c
# Parent  8f4f0ebffca2d8ab1196df49ddd517eae5506986
Added new decorate methods to the Debug class.

diff -r 8f4f0ebffca2 -r 09f66048738e graal/com.oracle.graal.debug/src/com/oracle/graal/debug/Debug.java
--- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/Debug.java	Wed Mar 21 13:13:47 2012 +0100
+++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/Debug.java	Wed Mar 21 13:49:34 2012 +0100
@@ -55,6 +55,22 @@
         return ENABLED && DebugScope.getInstance().isLogEnabled();
     }
 
+    public static Runnable decorateDebugRoot(Runnable runnable, String name, DebugConfig config) {
+        return runnable;
+    }
+
+    public static <T> Callable<T> decorateDebugRoot(Callable<T> callable, String name, DebugConfig config) {
+        return callable;
+    }
+
+    public static Runnable decorateScope(Runnable runnable, String name, Object... context) {
+        return runnable;
+    }
+
+    public static <T> Callable<T> decorateScope(Callable<T> callable, String name, Object... context) {
+        return callable;
+    }
+
     public static void sandbox(String name, Runnable runnable) {
         if (ENABLED) {
             DebugScope.getInstance().scope(name, runnable, null, true, new Object[0]);
diff -r 8f4f0ebffca2 -r 09f66048738e graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java	Wed Mar 21 13:13:47 2012 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java	Wed Mar 21 13:49:34 2012 +0100
@@ -28,7 +28,6 @@
 import com.oracle.graal.compiler.phases.*;
 import com.oracle.graal.compiler.phases.PhasePlan.*;
 import com.oracle.graal.debug.*;
-import com.oracle.graal.hotspot.snippets.*;
 import com.oracle.graal.java.*;
 import com.oracle.max.cri.ci.*;
 import com.oracle.max.cri.ri.*;
diff -r 8f4f0ebffca2 -r 09f66048738e graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/VMToCompilerImpl.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/VMToCompilerImpl.java	Wed Mar 21 13:13:47 2012 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/VMToCompilerImpl.java	Wed Mar 21 13:49:34 2012 +0100
@@ -40,7 +40,6 @@
 import com.oracle.graal.hotspot.ri.*;
 import com.oracle.graal.hotspot.server.*;
 import com.oracle.graal.hotspot.snippets.*;
-import com.oracle.graal.java.*;
 import com.oracle.graal.snippets.*;
 
 /**
@@ -276,7 +275,7 @@
             }
         }
 
-        CompilationTask task = CompilationTask.create(compiler, getDefaultPhasePlan(), method);
+        Runnable task = CompilationTask.create(compiler, getDefaultPhasePlan(), method);
         if (blocking) {
             task.run();
         } else {