*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/EdgesTest.java	Fri Jul  7 09:31:43 2017
--- new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/EdgesTest.java	Fri Jul  7 09:31:43 2017

*** 40,49 ****
--- 40,50 ----
  import org.graalvm.compiler.nodes.StructuredGraph;
  import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
  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;
  import org.graalvm.compiler.phases.tiers.HighTierContext;
  

*** 62,72 ****
--- 63,78 ----
              super(TYPE);
          }
  
      }
  
      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;
      ConstantNode i3;
      ConstantNode i4;