src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCompiledNmethod.java

*** 20,58 ****
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  package jdk.vm.ci.hotspot;
  
! import jdk.vm.ci.code.*;
! import jdk.vm.ci.inittimer.*;
  
  /**
   * {@link HotSpotCompiledCode} destined for installation as an nmethod.
   */
  public final class HotSpotCompiledNmethod extends HotSpotCompiledCode {
  
      public final HotSpotResolvedJavaMethod method;
      public final int entryBCI;
      public final int id;
      public final long jvmciEnv;
      public final boolean hasUnsafeAccess;
  
      /**
       * May be set by VM if code installation fails. It will describe in more detail why installation
       * failed (e.g., exactly which dependency failed).
       */
      @SuppressFBWarnings(value = "UWF_UNWRITTEN_FIELD", justification = "set by the VM") private String installationFailureMessage;
  
!     public HotSpotCompiledNmethod(HotSpotResolvedJavaMethod method, CompilationResult compResult) {
!         this(method, compResult, 0L);
!     }
! 
!     public HotSpotCompiledNmethod(HotSpotResolvedJavaMethod method, CompilationResult compResult, long jvmciEnv) {
          super(compResult);
          this.method = method;
          this.entryBCI = compResult.getEntryBCI();
!         this.id = compResult.getId();
          this.jvmciEnv = jvmciEnv;
          this.hasUnsafeAccess = compResult.hasUnsafeAccess();
      }
  
      @Override
--- 20,63 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  package jdk.vm.ci.hotspot;
  
! import jdk.vm.ci.code.CompilationResult;
! import jdk.vm.ci.inittimer.SuppressFBWarnings;
  
  /**
   * {@link HotSpotCompiledCode} destined for installation as an nmethod.
   */
  public final class HotSpotCompiledNmethod extends HotSpotCompiledCode {
  
      public final HotSpotResolvedJavaMethod method;
      public final int entryBCI;
+ 
+     /**
+      * Compilation identifier.
+      */
      public final int id;
+ 
+     /**
+      * Address of a native {@code JVMCIEnv} object or 0L if no such object exists.
+      */
      public final long jvmciEnv;
+ 
      public final boolean hasUnsafeAccess;
  
      /**
       * May be set by VM if code installation fails. It will describe in more detail why installation
       * failed (e.g., exactly which dependency failed).
       */
      @SuppressFBWarnings(value = "UWF_UNWRITTEN_FIELD", justification = "set by the VM") private String installationFailureMessage;
  
!     public HotSpotCompiledNmethod(HotSpotResolvedJavaMethod method, CompilationResult compResult, int id, long jvmciEnv) {
          super(compResult);
          this.method = method;
          this.entryBCI = compResult.getEntryBCI();
!         this.id = id;
          this.jvmciEnv = jvmciEnv;
          this.hasUnsafeAccess = compResult.hasUnsafeAccess();
      }
  
      @Override