*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Object_wait03.java	Fri Jul  7 09:30:34 2017
--- new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Object_wait03.java	Fri Jul  7 09:30:34 2017

*** 23,33 ****
--- 23,33 ----
  /*
   */
  package org.graalvm.compiler.jtt.threads;
  
  import org.graalvm.compiler.core.common.CancellationBailoutException;
! import org.graalvm.compiler.debug.DebugContext;
  import org.graalvm.compiler.jtt.JTTTest;
  import org.graalvm.compiler.nodes.Cancellable;
  import org.junit.Rule;
  import org.junit.Test;
  import org.junit.rules.DisableOnDebug;

*** 123,133 ****
--- 123,134 ----
          try {
              runTest("test", i);
          } catch (CancellationBailoutException e) {
              String message = String.format("Compilation cancelled after " + COMPILATION_TIMEOUT_MS + " ms");
              // For diagnosing expectedly long compilations (GR-3853)
!             Debug.forceDump(lastCompiledGraph, message);
!             DebugContext debug = getDebugContext();
+             debug.forceDump(lastCompiledGraph, message);
              throw new AssertionError(message, e);
          }
      }
  
      @Test