src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64.test/src/org/graalvm/compiler/hotspot/amd64/test/CompressedNullCheckTest.java

*** 20,41 ****
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  package org.graalvm.compiler.hotspot.amd64.test;
  
! import org.junit.Assert;
! import org.junit.Assume;
! import org.junit.Test;
  
- import org.graalvm.compiler.core.common.GraalOptions;
- import org.graalvm.compiler.hotspot.nodes.CompressionNode;
  import org.graalvm.compiler.hotspot.test.HotSpotGraalCompilerTest;
! import org.graalvm.compiler.nodes.StructuredGraph;
! import org.graalvm.compiler.nodes.ValueNode;
! import org.graalvm.compiler.nodes.calc.IsNullNode;
! import org.graalvm.compiler.options.OptionValue;
! import org.graalvm.compiler.options.OptionValue.OverrideScope;
  
  import jdk.vm.ci.meta.ResolvedJavaMethod;
  
  /**
   * Ensures that frame omission works in cases where it is expected to.
--- 20,35 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  package org.graalvm.compiler.hotspot.amd64.test;
  
! import static org.graalvm.compiler.core.common.GraalOptions.OptImplicitNullChecks;
  
  import org.graalvm.compiler.hotspot.test.HotSpotGraalCompilerTest;
! import org.graalvm.compiler.options.OptionValues;
! import org.junit.Assume;
! import org.junit.Test;
  
  import jdk.vm.ci.meta.ResolvedJavaMethod;
  
  /**
   * Ensures that frame omission works in cases where it is expected to.
*** 55,86 ****
          Assume.assumeTrue(runtime().getVMConfig().useCompressedOops);
  
          Container c = new Container();
          c.i = i;
  
-         try (OverrideScope s = OptionValue.override(GraalOptions.OptImplicitNullChecks, true)) {
              ResolvedJavaMethod method = getResolvedJavaMethod("testSnippet");
              Result expect = executeExpected(method, null, c);
  
              // make sure we don't get a profile that removes the implicit null check
              method.reprofile();
  
!             Result actual = executeActual(method, null, c);
              assertEquals(expect, actual);
          }
-     }
  
      @SuppressWarnings("try")
      private void testExplicit(Integer i) {
          Assume.assumeTrue(runtime().getVMConfig().useCompressedOops);
  
          Container c = new Container();
          c.i = i;
  
!         try (OverrideScope s = OptionValue.override(GraalOptions.OptImplicitNullChecks, false)) {
!             test("testSnippet", c);
!         }
      }
  
      @Test
      public void implicit() {
          testImplicit(new Integer(1));
--- 49,77 ----
          Assume.assumeTrue(runtime().getVMConfig().useCompressedOops);
  
          Container c = new Container();
          c.i = i;
  
          ResolvedJavaMethod method = getResolvedJavaMethod("testSnippet");
          Result expect = executeExpected(method, null, c);
  
          // make sure we don't get a profile that removes the implicit null check
          method.reprofile();
  
!         OptionValues options = new OptionValues(getInitialOptions(), OptImplicitNullChecks, true);
!         Result actual = executeActual(options, method, null, c);
          assertEquals(expect, actual);
      }
  
      @SuppressWarnings("try")
      private void testExplicit(Integer i) {
          Assume.assumeTrue(runtime().getVMConfig().useCompressedOops);
  
          Container c = new Container();
          c.i = i;
  
!         test(new OptionValues(getInitialOptions(), OptImplicitNullChecks, false), "testSnippet", c);
      }
  
      @Test
      public void implicit() {
          testImplicit(new Integer(1));
*** 98,117 ****
  
      @Test
      public void explicitNull() {
          testExplicit(null);
      }
- 
-     @Override
-     protected boolean checkMidTierGraph(StructuredGraph graph) {
-         int count = 0;
-         for (IsNullNode isNull : graph.getNodes().filter(IsNullNode.class).snapshot()) {
-             ValueNode value = isNull.getValue();
-             if (value instanceof CompressionNode) {
-                 count++;
-                 isNull.replaceFirstInput(value, ((CompressionNode) value).getValue());
-             }
-         }
-         Assert.assertEquals("graph should contain exactly one IsNullNode", 1, count);
-         return super.checkMidTierGraph(graph);
-     }
  }
--- 89,94 ----