src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/UnsafeVirtualizationTest.java

*** 30,42 ****
  import org.graalvm.compiler.phases.common.CanonicalizerPhase;
  import org.graalvm.compiler.phases.tiers.PhaseContext;
  import org.graalvm.compiler.virtual.phases.ea.PartialEscapePhase;
  import org.junit.Test;
  
  public class UnsafeVirtualizationTest extends GraalCompilerTest {
  
!     public static class A {
          int f1;
          int f2;
      }
  
      private static final long AF1Offset;
--- 30,53 ----
  import org.graalvm.compiler.phases.common.CanonicalizerPhase;
  import org.graalvm.compiler.phases.tiers.PhaseContext;
  import org.graalvm.compiler.virtual.phases.ea.PartialEscapePhase;
  import org.junit.Test;
  
+ import jdk.vm.ci.code.InstalledCode;
+ import jdk.vm.ci.meta.ResolvedJavaMethod;
+ 
  public class UnsafeVirtualizationTest extends GraalCompilerTest {
  
!     public static class Base {
!         /*
!          * This padding ensure that the size of the Base class ends up as a multiple of 8, which
!          * makes the first field of the subclass 8-byte aligned.
!          */
!         double padding;
!     }
! 
!     public static class A extends Base {
          int f1;
          int f2;
      }
  
      private static final long AF1Offset;
*** 54,94 ****
          }
          AF1Offset = o1;
          AF2Offset = o2;
      }
  
!     public static int unsafeSnippet0(int i1, int i2) {
          A a = new A();
!         UNSAFE.putDouble(a, AF1Offset, i1 + i2);
          return UNSAFE.getInt(a, AF1Offset) + UNSAFE.getInt(a, AF2Offset);
      }
  
!     public static int unsafeSnippet1(int i1, int i2) {
          A a = new A();
!         UNSAFE.putDouble(a, AF1Offset, i1 + i2);
          a.f2 = i1;
!         return (int) UNSAFE.getDouble(a, AF1Offset);
      }
  
      @Test
      public void testUnsafePEA01() {
!         testPartialEscapeReadElimination(parseEager("unsafeSnippet0", AllowAssumptions.NO), false);
!         testPartialEscapeReadElimination(parseEager("unsafeSnippet0", AllowAssumptions.NO), true);
      }
  
      @Test
      public void testUnsafePEA02() {
!         testPartialEscapeReadElimination(parseEager("unsafeSnippet1", AllowAssumptions.NO), false);
!         testPartialEscapeReadElimination(parseEager("unsafeSnippet1", AllowAssumptions.NO), true);
      }
  
!     public void testPartialEscapeReadElimination(StructuredGraph graph, boolean canonicalizeBefore) {
          OptionValues options = graph.getOptions();
          PhaseContext context = getDefaultHighTierContext();
          CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
          if (canonicalizeBefore) {
              canonicalizer.apply(graph, context);
          }
          new PartialEscapePhase(true, true, canonicalizer, null, options).apply(graph, context);
      }
- 
  }
--- 65,162 ----
          }
          AF1Offset = o1;
          AF2Offset = o2;
      }
  
!     public static int unsafeSnippet1(double i1) {
          A a = new A();
!         UNSAFE.putDouble(a, AF1Offset, i1);
          return UNSAFE.getInt(a, AF1Offset) + UNSAFE.getInt(a, AF2Offset);
      }
  
!     public static long unsafeSnippet2a(int i1) {
          A a = new A();
!         UNSAFE.putDouble(a, AF1Offset, i1);
!         a.f1 = i1;
!         return UNSAFE.getLong(a, AF1Offset);
!     }
! 
!     public static long unsafeSnippet2b(int i1) {
!         A a = new A();
!         UNSAFE.putDouble(a, AF1Offset, i1);
          a.f2 = i1;
!         return UNSAFE.getLong(a, AF1Offset);
!     }
! 
!     public static long unsafeSnippet3a(int i1) {
!         A a = new A();
!         UNSAFE.putDouble(a, AF1Offset, i1);
!         UNSAFE.putInt(a, AF1Offset, i1);
!         return UNSAFE.getLong(a, AF1Offset);
!     }
! 
!     public static long unsafeSnippet3b(int i1) {
!         A a = new A();
!         UNSAFE.putDouble(a, AF1Offset, i1);
!         UNSAFE.putInt(a, AF2Offset, i1);
!         return UNSAFE.getLong(a, AF1Offset);
!     }
! 
!     public static int unsafeSnippet4(double i1) {
!         A a = new A();
!         UNSAFE.putDouble(a, AF1Offset, i1);
!         UNSAFE.putDouble(a, AF1Offset, i1);
!         return UNSAFE.getInt(a, AF1Offset) + UNSAFE.getInt(a, AF2Offset);
      }
  
      @Test
      public void testUnsafePEA01() {
!         testPartialEscapeReadElimination("unsafeSnippet1", false, 1.0);
!         testPartialEscapeReadElimination("unsafeSnippet1", true, 1.0);
      }
  
      @Test
      public void testUnsafePEA02() {
!         testPartialEscapeReadElimination("unsafeSnippet2a", false, 1);
!         testPartialEscapeReadElimination("unsafeSnippet2a", true, 1);
! 
!         testPartialEscapeReadElimination("unsafeSnippet2b", false, 1);
!         testPartialEscapeReadElimination("unsafeSnippet2b", true, 1);
!     }
! 
!     @Test
!     public void testUnsafePEA03() {
!         testPartialEscapeReadElimination("unsafeSnippet3a", false, 1);
!         testPartialEscapeReadElimination("unsafeSnippet3a", true, 1);
! 
!         testPartialEscapeReadElimination("unsafeSnippet3b", false, 1);
!         testPartialEscapeReadElimination("unsafeSnippet3b", true, 1);
      }
  
!     @Test
!     public void testUnsafePEA04() {
!         testPartialEscapeReadElimination("unsafeSnippet4", false, 1.0);
!         testPartialEscapeReadElimination("unsafeSnippet4", true, 1.0);
!     }
! 
!     public void testPartialEscapeReadElimination(String snippet, boolean canonicalizeBefore, Object... args) {
!         assert AF1Offset % 8 == 0 : "First of the two int-fields must be 8-byte aligned";
! 
!         ResolvedJavaMethod method = getResolvedJavaMethod(snippet);
!         StructuredGraph graph = parseEager(snippet, AllowAssumptions.NO);
          OptionValues options = graph.getOptions();
          PhaseContext context = getDefaultHighTierContext();
          CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
          if (canonicalizeBefore) {
              canonicalizer.apply(graph, context);
          }
+         Result r = executeExpected(method, null, args);
          new PartialEscapePhase(true, true, canonicalizer, null, options).apply(graph, context);
+         try {
+             InstalledCode code = getCode(method, graph);
+             Object result = code.executeVarargs(args);
+             assertEquals(r, new Result(result, null));
+         } catch (Throwable e) {
+             assertFalse(true, e.toString());
+         }
      }
  }