test/hotspot/jtreg/compiler/jvmci/errors/CodeInstallerTest.java

*** 1,7 ****
  /*
!  * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 30,40 ****
--- 30,42 ----
  import jdk.vm.ci.code.StackSlot;
  import jdk.vm.ci.code.site.DataPatch;
  import jdk.vm.ci.code.site.Site;
  import jdk.vm.ci.hotspot.HotSpotCompiledCode;
  import jdk.vm.ci.hotspot.HotSpotCompiledCode.Comment;
+ import jdk.vm.ci.hotspot.HotSpotCompiledNmethod;
  import jdk.vm.ci.hotspot.HotSpotConstantReflectionProvider;
+ import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod;
  import jdk.vm.ci.meta.Assumptions.Assumption;
  import jdk.vm.ci.meta.MetaAccessProvider;
  import jdk.vm.ci.meta.PlatformKind;
  import jdk.vm.ci.meta.ResolvedJavaMethod;
  import jdk.vm.ci.runtime.JVMCI;
*** 48,58 ****
      protected final Architecture arch;
      protected final CodeCacheProvider codeCache;
      protected final MetaAccessProvider metaAccess;
      protected final HotSpotConstantReflectionProvider constantReflection;
  
!     protected final ResolvedJavaMethod dummyMethod;
  
      public static void dummyMethod() {
      }
  
      protected CodeInstallerTest() {
--- 50,60 ----
      protected final Architecture arch;
      protected final CodeCacheProvider codeCache;
      protected final MetaAccessProvider metaAccess;
      protected final HotSpotConstantReflectionProvider constantReflection;
  
!     protected final HotSpotResolvedJavaMethod dummyMethod;
  
      public static void dummyMethod() {
      }
  
      protected CodeInstallerTest() {
*** 67,82 ****
              method = CodeInstallerTest.class.getMethod("dummyMethod");
          } catch (NoSuchMethodException e) {
              Assert.fail();
          }
  
!         dummyMethod = metaAccess.lookupJavaMethod(method);
      }
  
      protected void installEmptyCode(Site[] sites, Assumption[] assumptions, Comment[] comments, int dataSectionAlignment, DataPatch[] dataSectionPatches, StackSlot deoptRescueSlot) {
!         HotSpotCompiledCode code = new HotSpotCompiledCode("dummyMethod", new byte[0], 0, sites, assumptions, new ResolvedJavaMethod[]{dummyMethod}, comments, new byte[8], dataSectionAlignment,
!                         dataSectionPatches, false, 0, deoptRescueSlot);
          codeCache.addCode(dummyMethod, code, null, null);
      }
  
      protected Register getRegister(PlatformKind kind, int index) {
          int idx = index;
--- 69,85 ----
              method = CodeInstallerTest.class.getMethod("dummyMethod");
          } catch (NoSuchMethodException e) {
              Assert.fail();
          }
  
!         dummyMethod = (HotSpotResolvedJavaMethod) metaAccess.lookupJavaMethod(method);
      }
  
      protected void installEmptyCode(Site[] sites, Assumption[] assumptions, Comment[] comments, int dataSectionAlignment, DataPatch[] dataSectionPatches, StackSlot deoptRescueSlot) {
!         HotSpotCompiledCode code = new HotSpotCompiledNmethod("dummyMethod", new byte[0], 0, sites, assumptions, new ResolvedJavaMethod[]{dummyMethod}, comments, new byte[8], dataSectionAlignment,
!                         dataSectionPatches, false, 0, deoptRescueSlot,
!                         dummyMethod, 0, 1, 0L, false);
          codeCache.addCode(dummyMethod, code, null, null);
      }
  
      protected Register getRegister(PlatformKind kind, int index) {
          int idx = index;