test/compiler/jvmci/compilerToVM/MaterializeVirtualObjectTest.java

*** 44,66 ****
   *     compiler.jvmci.compilerToVM.MaterializeVirtualObjectTest
   */
  
  package compiler.jvmci.compilerToVM;
  
! import compiler.jvmci.common.CTVMUtilities;
! import compiler.testlibrary.CompilerUtils;
  import jdk.vm.ci.hotspot.CompilerToVMHelper;
  import jdk.test.lib.Asserts;
  import sun.hotspot.WhiteBox;
- import java.lang.reflect.Method;
- import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethodImpl;
- import jdk.vm.ci.hotspot.HotSpotStackFrameReference;
  
  public class MaterializeVirtualObjectTest {
      private static final WhiteBox WB = WhiteBox.getWhiteBox();
      private static final Method METHOD;
!     private static final HotSpotResolvedJavaMethodImpl RESOLVED_METHOD;
      private static final boolean INVALIDATE = Boolean.getBoolean(
              "compiler.jvmci.compilerToVM.MaterializeVirtualObjectTest.invalidate");
  
      static {
          try {
--- 44,68 ----
   *     compiler.jvmci.compilerToVM.MaterializeVirtualObjectTest
   */
  
  package compiler.jvmci.compilerToVM;
  
! import java.lang.reflect.Method;
! import jdk.vm.ci.hotspot.HotSpotStackFrameReference;
! import jdk.vm.ci.meta.ResolvedJavaMethod;
  import jdk.vm.ci.hotspot.CompilerToVMHelper;
  import jdk.test.lib.Asserts;
+ 
+ import compiler.jvmci.common.CTVMUtilities;
+ import compiler.testlibrary.CompilerUtils;
+ 
  import sun.hotspot.WhiteBox;
  
  public class MaterializeVirtualObjectTest {
      private static final WhiteBox WB = WhiteBox.getWhiteBox();
      private static final Method METHOD;
!     private static final ResolvedJavaMethod RESOLVED_METHOD;
      private static final boolean INVALIDATE = Boolean.getBoolean(
              "compiler.jvmci.compilerToVM.MaterializeVirtualObjectTest.invalidate");
  
      static {
          try {
*** 111,121 ****
      private void check(boolean materialize) {
          // Materialize virtual objects on last invocation
          if (materialize) {
              HotSpotStackFrameReference hsFrame = CompilerToVMHelper
                      .getNextStackFrame(/* topmost frame */ null,
!                             new HotSpotResolvedJavaMethodImpl[]{
                                  RESOLVED_METHOD}, /* don't skip any */ 0);
              Asserts.assertNotNull(hsFrame, getName() + " : got null frame");
              Asserts.assertTrue(WB.isMethodCompiled(METHOD), getName()
                      + "Test method should be compiled");
              Asserts.assertTrue(hsFrame.hasVirtualObjects(), getName()
--- 113,123 ----
      private void check(boolean materialize) {
          // Materialize virtual objects on last invocation
          if (materialize) {
              HotSpotStackFrameReference hsFrame = CompilerToVMHelper
                      .getNextStackFrame(/* topmost frame */ null,
!                             new ResolvedJavaMethod[]{
                                  RESOLVED_METHOD}, /* don't skip any */ 0);
              Asserts.assertNotNull(hsFrame, getName() + " : got null frame");
              Asserts.assertTrue(WB.isMethodCompiled(METHOD), getName()
                      + "Test method should be compiled");
              Asserts.assertTrue(hsFrame.hasVirtualObjects(), getName()