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

*** 23,34 ****
--- 23,34 ----
  package org.graalvm.compiler.replacements.test;
  
  import java.util.Objects;
  
  import org.graalvm.compiler.api.directives.GraalDirectives;
! import org.graalvm.compiler.debug.DebugContext;
! import org.graalvm.compiler.debug.DebugConfigScope;
! import org.graalvm.compiler.debug.DebugContext.Scope;
  import org.graalvm.compiler.debug.GraalError;
  import org.graalvm.compiler.nodes.StructuredGraph;
  import org.graalvm.compiler.nodes.ValueNode;
  import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
  import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;

*** 145,155 ****
--- 145,156 ----
      @Test
      @SuppressWarnings("try")
      public void testFieldOffsetMergeNonLiveBasePointer() {
          thrown.expect(GraalError.class);
          thrown.expectMessage(UNKNOWN_REFERENCE_AT_SAFEPOINT_MSG);
          try (DebugConfigScope s = Debug.setConfig(Debug.silentConfig())) {
+         DebugContext debug = getDebugContext();
+         try (Scope s = debug.disable()) {
              // Run a couple times to encourage objects to move
              for (int i = 0; i < 4; i++) {
                  Result r = new Result();
                  test("fieldOffsetMergeSnippet01", r, 8L, 16L);
                  Assert.assertEquals(r.beforeGC.delta(), r.afterGC.delta());

*** 169,179 ****
--- 170,181 ----
      @Test
      @SuppressWarnings("try")
      public void testFieldOffsetMergeLiveBasePointer() {
          thrown.expect(GraalError.class);
          thrown.expectMessage(UNKNOWN_REFERENCE_AT_SAFEPOINT_MSG);
          try (DebugConfigScope s = Debug.setConfig(Debug.silentConfig())) {
+         DebugContext debug = getDebugContext();
+         try (Scope s = debug.disable()) {
              // Run a couple times to encourage objects to move
              for (int i = 0; i < 4; i++) {
                  Result r = new Result();
                  test("fieldOffsetMergeSnippet03", r, new Result(), new Result(), 8L, 16L);
                  Assert.assertEquals(r.beforeGC.delta(), r.afterGC.delta());