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

rev 56282 : [mq]: graal

*** 1,7 ****
  /*
!  * Copyright (c) 2012, 2018, 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) 2012, 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.
*** 276,297 ****
      }
  
      /**
       * Time spent in compilation.
       */
!     private static final TimerKey CompilationTime = DebugContext.timer("CompilationTime").doc("Time spent in compilation and code installation.");
  
      /**
       * Counts the number of compiled {@linkplain CompilationResult#getBytecodeSize() bytecodes}.
       */
      private static final CounterKey CompiledBytecodes = DebugContext.counter("CompiledBytecodes");
  
      /**
       * Counts the number of compiled {@linkplain CompilationResult#getBytecodeSize() bytecodes} for
       * which {@linkplain CompilationResult#getTargetCode()} code was installed.
       */
!     private static final CounterKey CompiledAndInstalledBytecodes = DebugContext.counter("CompiledAndInstalledBytecodes");
  
      /**
       * Counts the number of installed {@linkplain CompilationResult#getTargetCodeSize()} bytes.
       */
      private static final CounterKey InstalledCodeSize = DebugContext.counter("InstalledCodeSize");
--- 276,297 ----
      }
  
      /**
       * Time spent in compilation.
       */
!     public static final TimerKey CompilationTime = DebugContext.timer("CompilationTime").doc("Time spent in compilation and code installation.");
  
      /**
       * Counts the number of compiled {@linkplain CompilationResult#getBytecodeSize() bytecodes}.
       */
      private static final CounterKey CompiledBytecodes = DebugContext.counter("CompiledBytecodes");
  
      /**
       * Counts the number of compiled {@linkplain CompilationResult#getBytecodeSize() bytecodes} for
       * which {@linkplain CompilationResult#getTargetCode()} code was installed.
       */
!     public static final CounterKey CompiledAndInstalledBytecodes = DebugContext.counter("CompiledAndInstalledBytecodes");
  
      /**
       * Counts the number of installed {@linkplain CompilationResult#getTargetCodeSize()} bytes.
       */
      private static final CounterKey InstalledCodeSize = DebugContext.counter("InstalledCodeSize");
*** 301,312 ****
       */
      public static final TimerKey CodeInstallationTime = DebugContext.timer("CodeInstallation");
  
      public HotSpotCompilationRequestResult runCompilation(OptionValues initialOptions) {
          OptionValues options = filterOptions(initialOptions);
!         SnippetReflectionProvider snippetReflection = compiler.getGraalRuntime().getHostProviders().getSnippetReflection();
!         try (DebugContext debug = DebugContext.create(options, new GraalDebugHandlersFactory(snippetReflection))) {
              return runCompilation(debug);
          }
      }
  
      @SuppressWarnings("try")
--- 301,312 ----
       */
      public static final TimerKey CodeInstallationTime = DebugContext.timer("CodeInstallation");
  
      public HotSpotCompilationRequestResult runCompilation(OptionValues initialOptions) {
          OptionValues options = filterOptions(initialOptions);
!         HotSpotGraalRuntimeProvider graalRuntime = compiler.getGraalRuntime();
!         try (DebugContext debug = graalRuntime.openDebugContext(options, compilationId, getMethod(), compiler.getDebugHandlersFactories(), DebugContext.DEFAULT_LOG_STREAM)) {
              return runCompilation(debug);
          }
      }
  
      @SuppressWarnings("try")