*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/NodeUsagesTests.java	Fri Jul  7 09:29:56 2017
--- new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/NodeUsagesTests.java	Fri Jul  7 09:29:56 2017

*** 34,43 ****
--- 34,44 ----
  
  import org.graalvm.compiler.graph.Graph;
  import org.graalvm.compiler.graph.Node;
  import org.graalvm.compiler.graph.NodeClass;
  import org.graalvm.compiler.nodeinfo.NodeInfo;
+ import org.graalvm.compiler.options.OptionValues;
  
  public class NodeUsagesTests extends GraphTest {
  
      @NodeInfo(cycles = CYCLES_IGNORED, size = SIZE_IGNORED)
      static final class Def extends Node {

*** 64,74 ****
--- 65,76 ----
  
      }
  
      @Test
      public void testReplaceAtUsages() {
!         Graph graph = new Graph(getOptions());
!         OptionValues options = getOptions();
+         Graph graph = new Graph(options, getDebug(options));
          Def def0 = graph.add(new Def());
          Def def1 = graph.add(new Def());
          Use use0 = graph.add(new Use(def0, null, null));
          Use use1 = graph.add(new Use(null, def0, null));
          Use use2 = graph.add(new Use(null, null, def0));

*** 93,103 ****
--- 95,106 ----
          assertThat(def1.usages(), isNotEmpty());
      }
  
      @Test
      public void testReplaceAtUsagesWithPredicateAll() {
!         Graph graph = new Graph(getOptions());
!         OptionValues options = getOptions();
+         Graph graph = new Graph(options, getDebug(options));
          Def def0 = graph.add(new Def());
          Def def1 = graph.add(new Def());
          Use use0 = graph.add(new Use(def0, null, null));
          Use use1 = graph.add(new Use(null, def0, null));
          Use use2 = graph.add(new Use(null, null, def0));

*** 122,132 ****
--- 125,136 ----
          assertThat(def1.usages(), isNotEmpty());
      }
  
      @Test
      public void testReplaceAtUsagesWithPredicateNone() {
!         Graph graph = new Graph(getOptions());
!         OptionValues options = getOptions();
+         Graph graph = new Graph(options, getDebug(options));
          Def def0 = graph.add(new Def());
          Def def1 = graph.add(new Def());
          Use use0 = graph.add(new Use(def0, null, null));
          Use use1 = graph.add(new Use(null, def0, null));
          Use use2 = graph.add(new Use(null, null, def0));

*** 151,161 ****
--- 155,166 ----
          assertThat(def0.usages(), isNotEmpty());
      }
  
      @Test
      public void testReplaceAtUsagesWithPredicate1() {
!         Graph graph = new Graph(getOptions());
!         OptionValues options = getOptions();
+         Graph graph = new Graph(options, getDebug(options));
          Def def0 = graph.add(new Def());
          Def def1 = graph.add(new Def());
          Use use0 = graph.add(new Use(def0, null, null));
          Use use1 = graph.add(new Use(null, def0, null));
          Use use2 = graph.add(new Use(null, null, def0));

*** 182,192 ****
--- 187,198 ----
          assertThat(def0.usages(), isNotEmpty());
      }
  
      @Test
      public void testReplaceAtUsagesWithPredicate2() {
!         Graph graph = new Graph(getOptions());
!         OptionValues options = getOptions();
+         Graph graph = new Graph(options, getDebug(options));
          Def def0 = graph.add(new Def());
          Def def1 = graph.add(new Def());
          Use use0 = graph.add(new Use(def0, null, null));
          Use use1 = graph.add(new Use(null, def0, null));
          Use use2 = graph.add(new Use(null, null, def0));

*** 213,223 ****
--- 219,230 ----
          assertThat(def0.usages(), isNotEmpty());
      }
  
      @Test
      public void testReplaceAtUsagesWithPredicate0() {
!         Graph graph = new Graph(getOptions());
!         OptionValues options = getOptions();
+         Graph graph = new Graph(options, getDebug(options));
          Def def0 = graph.add(new Def());
          Def def1 = graph.add(new Def());
          Use use0 = graph.add(new Use(def0, null, null));
          Use use1 = graph.add(new Use(null, def0, null));
          Use use2 = graph.add(new Use(null, null, def0));

*** 244,254 ****
--- 251,262 ----
          assertThat(def0.usages(), isNotEmpty());
      }
  
      @Test
      public void testReplaceAtUsagesWithPredicate02() {
!         Graph graph = new Graph(getOptions());
!         OptionValues options = getOptions();
+         Graph graph = new Graph(options, getDebug(options));
          Def def0 = graph.add(new Def());
          Def def1 = graph.add(new Def());
          Use use0 = graph.add(new Use(def0, null, null));
          Use use1 = graph.add(new Use(null, def0, null));
          Use use2 = graph.add(new Use(null, null, def0));

*** 275,285 ****
--- 283,294 ----
          assertThat(def1.usages(), isNotEmpty());
      }
  
      @Test
      public void testReplaceAtUsagesWithPredicate023() {
!         Graph graph = new Graph(getOptions());
!         OptionValues options = getOptions();
+         Graph graph = new Graph(options, getDebug(options));
          Def def0 = graph.add(new Def());
          Def def1 = graph.add(new Def());
          Use use0 = graph.add(new Use(def0, null, null));
          Use use1 = graph.add(new Use(null, def0, null));
          Use use2 = graph.add(new Use(null, null, def0));

*** 309,319 ****
--- 318,329 ----
          assertThat(def1.usages(), isNotEmpty());
      }
  
      @Test
      public void testReplaceAtUsagesWithPredicate013() {
!         Graph graph = new Graph(getOptions());
!         OptionValues options = getOptions();
+         Graph graph = new Graph(options, getDebug(options));
          Def def0 = graph.add(new Def());
          Def def1 = graph.add(new Def());
          Use use0 = graph.add(new Use(def0, null, null));
          Use use1 = graph.add(new Use(null, def0, null));
          Use use2 = graph.add(new Use(null, null, def0));

*** 343,353 ****
--- 353,364 ----
          assertThat(def1.usages(), isNotEmpty());
      }
  
      @Test
      public void testReplaceAtUsagesWithPredicate203() {
!         Graph graph = new Graph(getOptions());
!         OptionValues options = getOptions();
+         Graph graph = new Graph(options, getDebug(options));
          Def def0 = graph.add(new Def());
          Def def1 = graph.add(new Def());
          Use use0 = graph.add(new Use(def0, null, null));
          Use use1 = graph.add(new Use(null, def0, null));
          Use use2 = graph.add(new Use(null, null, def0));

*** 377,387 ****
--- 388,399 ----
          assertThat(def0.usages(), isNotEmpty());
      }
  
      @Test
      public void testReplaceAtUsagesWithPredicate01() {
!         Graph graph = new Graph(getOptions());
!         OptionValues options = getOptions();
+         Graph graph = new Graph(options, getDebug(options));
          Def def0 = graph.add(new Def());
          Def def1 = graph.add(new Def());
          Use use0 = graph.add(new Use(def0, null, null));
          Use use1 = graph.add(new Use(null, def0, null));
          Use use2 = graph.add(new Use(null, null, def0));

*** 408,418 ****
--- 420,431 ----
          assertThat(def1.usages(), isNotEmpty());
      }
  
      @Test
      public void testReplaceAtUsagesWithPredicate12() {
!         Graph graph = new Graph(getOptions());
!         OptionValues options = getOptions();
+         Graph graph = new Graph(options, getDebug(options));
          Def def0 = graph.add(new Def());
          Def def1 = graph.add(new Def());
          Use use0 = graph.add(new Use(def0, null, null));
          Use use1 = graph.add(new Use(null, def0, null));
          Use use2 = graph.add(new Use(null, null, def0));