*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/VirtualUtil.java	Fri Jul  7 09:31:56 2017
--- new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/VirtualUtil.java	Fri Jul  7 09:31:56 2017

*** 24,34 ****
--- 24,34 ----
  
  import static org.graalvm.compiler.core.common.GraalOptions.TraceEscapeAnalysis;
  
  import java.util.List;
  
! import org.graalvm.compiler.debug.DebugContext;
  import org.graalvm.compiler.debug.GraalError;
  import org.graalvm.compiler.debug.TTY;
  import org.graalvm.compiler.graph.Node;
  import org.graalvm.compiler.graph.NodeFlood;
  import org.graalvm.compiler.nodes.AbstractEndNode;

*** 49,58 ****
--- 49,59 ----
      public static boolean assertNonReachable(StructuredGraph graph, List<Node> obsoleteNodes) {
          // Helper code that determines the paths that keep obsolete nodes alive.
          // Nodes with support for GVN can be kept alive by GVN and are therefore not part of the
          // assertion.
  
+         DebugContext debug = graph.getDebug();
          NodeFlood flood = graph.createNodeFlood();
          EconomicMap<Node, Node> path = EconomicMap.create(Equivalence.IDENTITY);
          flood.add(graph.start());
          for (Node current : flood) {
              if (current instanceof AbstractEndNode) {

*** 113,154 ****
--- 114,155 ----
                  success = false;
              }
          }
          if (!success) {
              TTY.println();
!             Debug.forceDump(graph, "assertNonReachable");
!             debug.forceDump(graph, "assertNonReachable");
          }
          return success;
      }
  
!     public static void trace(OptionValues options, DebugContext debug, String msg) {
!         if (Debug.isEnabled() && TraceEscapeAnalysis.getValue(options) && Debug.isLogEnabled()) {
!             Debug.log(msg);
!         if (debug.areScopesEnabled() && TraceEscapeAnalysis.getValue(options) && debug.isLogEnabled()) {
!             debug.log(msg);
          }
      }
  
!     public static void trace(OptionValues options, DebugContext debug, String format, Object obj) {
!         if (Debug.isEnabled() && TraceEscapeAnalysis.getValue(options) && Debug.isLogEnabled()) {
!             Debug.logv(format, obj);
!         if (debug.areScopesEnabled() && TraceEscapeAnalysis.getValue(options) && debug.isLogEnabled()) {
!             debug.logv(format, obj);
          }
      }
  
!     public static void trace(OptionValues options, DebugContext debug, String format, Object obj, Object obj2) {
!         if (Debug.isEnabled() && TraceEscapeAnalysis.getValue(options) && Debug.isLogEnabled()) {
!             Debug.logv(format, obj, obj2);
!         if (debug.areScopesEnabled() && TraceEscapeAnalysis.getValue(options) && debug.isLogEnabled()) {
!             debug.logv(format, obj, obj2);
          }
      }
  
!     public static void trace(OptionValues options, DebugContext debug, String format, Object obj, Object obj2, Object obj3) {
!         if (Debug.isEnabled() && TraceEscapeAnalysis.getValue(options) && Debug.isLogEnabled()) {
!             Debug.logv(format, obj, obj2, obj3);
!         if (debug.areScopesEnabled() && TraceEscapeAnalysis.getValue(options) && debug.isLogEnabled()) {
!             debug.logv(format, obj, obj2, obj3);
          }
      }
  
!     public static void trace(OptionValues options, DebugContext debug, String format, Object obj, Object obj2, Object obj3, Object obj4) {
!         if (Debug.isEnabled() && TraceEscapeAnalysis.getValue(options) && Debug.isLogEnabled()) {
!             Debug.logv(format, obj, obj2, obj3, obj4);
!         if (debug.areScopesEnabled() && TraceEscapeAnalysis.getValue(options) && debug.isLogEnabled()) {
!             debug.logv(format, obj, obj2, obj3, obj4);
          }
      }
  
      public static boolean matches(StructuredGraph graph, String filter) {
          if (filter != null) {