hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GraphEncoder.java
--- a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GraphEncoder.java Fri Jul 07 10:37:52 2017 +0200
+++ b/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GraphEncoder.java Fri Jul 07 09:40:47 2017 -0700
@@ -33,7 +33,7 @@
import org.graalvm.compiler.core.common.util.TypeReader;
import org.graalvm.compiler.core.common.util.TypeWriter;
import org.graalvm.compiler.core.common.util.UnsafeArrayTypeWriter;
-import org.graalvm.compiler.debug.Debug;
+import org.graalvm.compiler.debug.DebugContext;
import org.graalvm.compiler.graph.Edges;
import org.graalvm.compiler.graph.Node;
import org.graalvm.compiler.graph.NodeClass;
@@ -42,8 +42,8 @@
import org.graalvm.compiler.graph.iterators.NodeIterable;
import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
import org.graalvm.compiler.nodes.java.ExceptionObjectNode;
+import org.graalvm.util.Pair;
import org.graalvm.util.UnmodifiableMapCursor;
-import org.graalvm.util.Pair;
import jdk.vm.ci.code.Architecture;
@@ -418,7 +418,8 @@
*/
@SuppressWarnings("try")
public static boolean verifyEncoding(StructuredGraph originalGraph, EncodedGraph encodedGraph, Architecture architecture) {
- StructuredGraph decodedGraph = new StructuredGraph.Builder(originalGraph.getOptions(), AllowAssumptions.YES).method(originalGraph.method()).build();
+ DebugContext debug = originalGraph.getDebug();
+ StructuredGraph decodedGraph = new StructuredGraph.Builder(originalGraph.getOptions(), debug, AllowAssumptions.YES).method(originalGraph.method()).build();
GraphDecoder decoder = new GraphDecoder(architecture, decodedGraph);
decoder.decode(encodedGraph);
@@ -426,9 +427,10 @@
try {
GraphComparison.verifyGraphsEqual(originalGraph, decodedGraph);
} catch (Throwable ex) {
- try (Debug.Scope scope = Debug.scope("GraphEncoder")) {
- Debug.dump(Debug.VERBOSE_LEVEL, originalGraph, "Original Graph");
- Debug.dump(Debug.VERBOSE_LEVEL, decodedGraph, "Decoded Graph");
+ originalGraph.getDebug();
+ try (DebugContext.Scope scope = debug.scope("GraphEncoder")) {
+ debug.dump(DebugContext.VERBOSE_LEVEL, originalGraph, "Original Graph");
+ debug.dump(DebugContext.VERBOSE_LEVEL, decodedGraph, "Decoded Graph");
}
throw ex;
}