# HG changeset patch # User Doug Simon # Date 1383080468 -3600 # Node ID 9cd8dbb8a37d670b2fb5aa115065a48e09b3b309 # Parent e09959e910f712479cf0e7fd2c6c9ceca0652d70 re-added a graph context to the debug scopes entered by Truffle partial evaluation and compilation so that -G:+DumpOnError works again diff -r e09959e910f7 -r 9cd8dbb8a37d graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java --- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java Tue Oct 29 21:59:38 2013 +0100 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java Tue Oct 29 22:01:08 2013 +0100 @@ -104,7 +104,7 @@ final StructuredGraph graph = new StructuredGraph(executeHelperMethod); - Debug.scope("createGraph", new Runnable() { + Debug.scope("createGraph", graph, new Runnable() { @Override public void run() { diff -r e09959e910f7 -r 9cd8dbb8a37d graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCompilerImpl.java --- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCompilerImpl.java Tue Oct 29 21:59:38 2013 +0100 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCompilerImpl.java Tue Oct 29 22:01:08 2013 +0100 @@ -217,7 +217,7 @@ @Override public CompilationResult call() { try (TimerCloseable a = CompilationTime.start()) { - return Debug.scope("GraalCompiler", new Object[]{providers.getCodeCache()}, new Callable() { + return Debug.scope("GraalCompiler", new Object[]{graph, providers.getCodeCache()}, new Callable() { public CompilationResult call() { CodeCacheProvider codeCache = providers.getCodeCache(); CallingConvention cc = getCallingConvention(codeCache, Type.JavaCallee, graph.method(), false);