src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotCompiledCodeBuilder.java

*** 86,96 ****
  
          Assumption[] assumptions = compResult.getAssumptions();
  
          ResolvedJavaMethod[] methods = compResult.getMethods();
  
!         List<CodeAnnotation> annotations = compResult.getAnnotations();
          Comment[] comments = new Comment[annotations.size()];
          if (!annotations.isEmpty()) {
              for (int i = 0; i < comments.length; i++) {
                  CodeAnnotation annotation = annotations.get(i);
                  String text;
--- 86,96 ----
  
          Assumption[] assumptions = compResult.getAssumptions();
  
          ResolvedJavaMethod[] methods = compResult.getMethods();
  
!         List<CodeAnnotation> annotations = compResult.getCodeAnnotations();
          Comment[] comments = new Comment[annotations.size()];
          if (!annotations.isEmpty()) {
              for (int i = 0; i < comments.length; i++) {
                  CodeAnnotation annotation = annotations.get(i);
                  String text;
*** 127,146 ****
              HotSpotResolvedJavaMethod hsMethod = (HotSpotResolvedJavaMethod) method;
              int entryBCI = compResult.getEntryBCI();
              boolean hasUnsafeAccess = compResult.hasUnsafeAccess();
  
              int id;
!             long jvmciEnv;
              if (compRequest != null) {
                  id = compRequest.getId();
!                 jvmciEnv = compRequest.getJvmciEnv();
              } else {
                  id = hsMethod.allocateCompileId(entryBCI);
!                 jvmciEnv = 0L;
              }
              return new HotSpotCompiledNmethod(name, targetCode, targetCodeSize, sites, assumptions, methods, comments, dataSection, dataSectionAlignment, dataSectionPatches, isImmutablePIC,
!                             totalFrameSize, customStackArea, hsMethod, entryBCI, id, jvmciEnv, hasUnsafeAccess);
          } else {
              return new HotSpotCompiledCode(name, targetCode, targetCodeSize, sites, assumptions, methods, comments, dataSection, dataSectionAlignment, dataSectionPatches, isImmutablePIC,
                              totalFrameSize, customStackArea);
          }
      }
--- 127,146 ----
              HotSpotResolvedJavaMethod hsMethod = (HotSpotResolvedJavaMethod) method;
              int entryBCI = compResult.getEntryBCI();
              boolean hasUnsafeAccess = compResult.hasUnsafeAccess();
  
              int id;
!             long jvmciCompileState;
              if (compRequest != null) {
                  id = compRequest.getId();
!                 jvmciCompileState = compRequest.getJvmciEnv();
              } else {
                  id = hsMethod.allocateCompileId(entryBCI);
!                 jvmciCompileState = 0L;
              }
              return new HotSpotCompiledNmethod(name, targetCode, targetCodeSize, sites, assumptions, methods, comments, dataSection, dataSectionAlignment, dataSectionPatches, isImmutablePIC,
!                             totalFrameSize, customStackArea, hsMethod, entryBCI, id, jvmciCompileState, hasUnsafeAccess);
          } else {
              return new HotSpotCompiledCode(name, targetCode, targetCodeSize, sites, assumptions, methods, comments, dataSection, dataSectionAlignment, dataSectionPatches, isImmutablePIC,
                              totalFrameSize, customStackArea);
          }
      }