--- old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/EdgesTest.java	2017-07-07 09:31:43.000000000 -0700
+++ new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/EdgesTest.java	2017-07-07 09:31:43.000000000 -0700
@@ -42,6 +42,7 @@
 import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.calc.FloatingNode;
 import org.graalvm.compiler.nodes.java.InstanceOfNode;
+import org.graalvm.compiler.options.OptionValues;
 import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.graalvm.compiler.phases.common.inlining.InliningPhase;
 import org.graalvm.compiler.phases.common.inlining.policy.InlineMethodSubstitutionsPolicy;
@@ -64,7 +65,12 @@
 
     }
 
-    StructuredGraph graph = new StructuredGraph.Builder(getInitialOptions()).build();
+    protected StructuredGraph createGraph() {
+        OptionValues options = getInitialOptions();
+        return new StructuredGraph.Builder(options, getDebugContext(options)).build();
+    }
+
+    StructuredGraph graph = createGraph();
     TestNode node;
     ConstantNode i1;
     ConstantNode i2;