--- old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/EffectList.java	2017-07-07 09:31:52.000000000 -0700
+++ new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/EffectList.java	2017-07-07 09:31:52.000000000 -0700
@@ -27,7 +27,7 @@
 import java.util.Arrays;
 import java.util.Iterator;
 
-import org.graalvm.compiler.debug.Debug;
+import org.graalvm.compiler.debug.DebugContext;
 import org.graalvm.compiler.debug.GraalError;
 import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.nodes.StructuredGraph;
@@ -62,10 +62,15 @@
     private static final Effect[] EMPTY_ARRAY = new Effect[0];
     private static final String[] EMPTY_STRING_ARRAY = new String[0];
 
+    private final DebugContext debug;
     private Effect[] effects = EMPTY_ARRAY;
     private String[] names = EMPTY_STRING_ARRAY;
     private int size;
 
+    public EffectList(DebugContext debug) {
+        this.debug = debug;
+    }
+
     private void enlarge(int elements) {
         int length = effects.length;
         if (size + elements > length) {
@@ -73,7 +78,7 @@
                 length = Math.max(length * 2, 4);
             }
             effects = Arrays.copyOf(effects, length);
-            if (Debug.isEnabled()) {
+            if (debug.isLogEnabled()) {
                 names = Arrays.copyOf(names, length);
             }
         }
@@ -86,7 +91,7 @@
     public void add(String name, Effect effect) {
         assert effect != null;
         enlarge(1);
-        if (Debug.isEnabled()) {
+        if (debug.isLogEnabled()) {
             names[size] = name;
         }
         effects[size++] = effect;
@@ -95,7 +100,7 @@
     public void addAll(EffectList list) {
         enlarge(list.size);
         System.arraycopy(list.effects, 0, effects, size, list.size);
-        if (Debug.isEnabled()) {
+        if (debug.isLogEnabled()) {
             System.arraycopy(list.names, 0, names, size, list.size);
         }
         size += list.size;
@@ -106,7 +111,7 @@
         enlarge(list.size);
         System.arraycopy(effects, position, effects, position + list.size, size - position);
         System.arraycopy(list.effects, 0, effects, position, list.size);
-        if (Debug.isEnabled()) {
+        if (debug.isLogEnabled()) {
             System.arraycopy(names, position, names, position + list.size, size - position);
             System.arraycopy(list.names, 0, names, position, list.size);
         }
@@ -176,10 +181,10 @@
                     toString(str, i);
                     throw new GraalError(t).addContext("effect", str);
                 }
-                if (effect.isVisible() && Debug.isLogEnabled()) {
+                if (effect.isVisible() && debug.isLogEnabled()) {
                     StringBuilder str = new StringBuilder();
                     toString(str, i);
-                    Debug.log("    %s", str);
+                    debug.log("    %s", str);
                 }
             }
         }
@@ -227,7 +232,7 @@
     }
 
     private String getName(int i) {
-        if (Debug.isEnabled()) {
+        if (debug.isLogEnabled()) {
             return names[i];
         } else {
             return "";