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

*** 93,102 ****
--- 93,104 ----
  /**
   * Singleton class holding the instance of the {@link GraalRuntime}.
   */
  public final class HotSpotGraalRuntime implements HotSpotGraalRuntimeProvider {
  
+     private static final boolean IS_AOT = Boolean.getBoolean("com.oracle.graalvm.isaot");
+ 
      private static boolean checkArrayIndexScaleInvariants(MetaAccessProvider metaAccess) {
          assert metaAccess.getArrayIndexScale(JavaKind.Byte) == 1;
          assert metaAccess.getArrayIndexScale(JavaKind.Boolean) == 1;
          assert metaAccess.getArrayIndexScale(JavaKind.Char) == 2;
          assert metaAccess.getArrayIndexScale(JavaKind.Short) == 2;
*** 157,169 ****
          snippetCounterGroups = GraalOptions.SnippetCounters.getValue(options) ? new ArrayList<>() : null;
          CompilerConfiguration compilerConfiguration = compilerConfigurationFactory.createCompilerConfiguration();
          compilerConfigurationName = compilerConfigurationFactory.getName();
  
          compiler = new HotSpotGraalCompiler(jvmciRuntime, this, options);
!         management = GraalServices.loadSingle(HotSpotGraalManagementRegistration.class, false);
!         if (management != null) {
!             management.initialize(this);
          }
  
          BackendMap backendMap = compilerConfigurationFactory.createBackendMap();
  
          JVMCIBackend hostJvmciBackend = jvmciRuntime.getHostJVMCIBackend();
--- 159,175 ----
          snippetCounterGroups = GraalOptions.SnippetCounters.getValue(options) ? new ArrayList<>() : null;
          CompilerConfiguration compilerConfiguration = compilerConfigurationFactory.createCompilerConfiguration();
          compilerConfigurationName = compilerConfigurationFactory.getName();
  
          compiler = new HotSpotGraalCompiler(jvmciRuntime, this, options);
!         if (IS_AOT) {
!             management = null;
!         } else {
!             management = GraalServices.loadSingle(HotSpotGraalManagementRegistration.class, false);
!             if (management != null) {
!                 management.initialize(this);
!             }
          }
  
          BackendMap backendMap = compilerConfigurationFactory.createBackendMap();
  
          JVMCIBackend hostJvmciBackend = jvmciRuntime.getHostJVMCIBackend();
*** 569,579 ****
  
      private void dumpMethod(HotSpotResolvedJavaMethod hotSpotMethod, String filter, String host, int port) throws Exception {
          EconomicMap<OptionKey<?>, Object> extra = EconomicMap.create();
          extra.put(DebugOptions.Dump, filter);
          extra.put(DebugOptions.PrintGraphHost, host);
!         extra.put(DebugOptions.PrintBinaryGraphPort, port);
          OptionValues compileOptions = new OptionValues(getOptions(), extra);
          compiler.compileMethod(new HotSpotCompilationRequest(hotSpotMethod, -1, 0L), false, compileOptions);
      }
  
      public Object invokeManagementAction(String actionName, Object[] params) throws Exception {
--- 575,585 ----
  
      private void dumpMethod(HotSpotResolvedJavaMethod hotSpotMethod, String filter, String host, int port) throws Exception {
          EconomicMap<OptionKey<?>, Object> extra = EconomicMap.create();
          extra.put(DebugOptions.Dump, filter);
          extra.put(DebugOptions.PrintGraphHost, host);
!         extra.put(DebugOptions.PrintGraphPort, port);
          OptionValues compileOptions = new OptionValues(getOptions(), extra);
          compiler.compileMethod(new HotSpotCompilationRequest(hotSpotMethod, -1, 0L), false, compileOptions);
      }
  
      public Object invokeManagementAction(String actionName, Object[] params) throws Exception {