# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1331207179 -3600
# Node ID 90c150a0a22b9da3fb75b476bd8fb8481a1b1b7f
# Parent  b4f548d49f965b2776bea3e9075944d64607dfa3# Parent  c53115427ff9ade451ac97a6ce1ef92989cbe292
Merge.

diff -r c53115427ff9 -r 90c150a0a22b graal/com.oracle.max.graal.hotspot/src/com/oracle/max/graal/hotspot/bridge/VMToCompilerImpl.java
--- a/graal/com.oracle.max.graal.hotspot/src/com/oracle/max/graal/hotspot/bridge/VMToCompilerImpl.java	Wed Mar 07 14:35:22 2012 -0800
+++ b/graal/com.oracle.max.graal.hotspot/src/com/oracle/max/graal/hotspot/bridge/VMToCompilerImpl.java	Thu Mar 08 12:46:19 2012 +0100
@@ -312,7 +312,7 @@
                         TTY.Filter filter = new TTY.Filter(GraalOptions.PrintFilter, method);
                         long nanoTime;
                         try {
-                            result = Debug.scope("Compiling", method, new Callable<CiTargetMethod>() {
+                            result = Debug.scope("Compiling", new Callable<CiTargetMethod>() {
                                 @Override
                                 public CiTargetMethod call() throws Exception {
                                     return compiler.getCompiler().compileMethod(method, -1, plan);