*** old/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/AOTCompilationTask.java	Mon Mar 20 17:36:50 2017
--- new/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/AOTCompilationTask.java	Mon Mar 20 17:36:50 2017

*** 31,40 ****
--- 31,41 ----
  import org.graalvm.compiler.debug.Debug;
  import org.graalvm.compiler.debug.DebugEnvironment;
  import org.graalvm.compiler.debug.Management;
  import org.graalvm.compiler.debug.TTY;
  import org.graalvm.compiler.debug.internal.DebugScope;
+ import org.graalvm.compiler.options.OptionValues;
  
  import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
  import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod;
  import jdk.vm.ci.meta.ResolvedJavaMethod;
  import jdk.vm.ci.runtime.JVMCICompiler;

*** 52,61 ****
--- 53,64 ----
  
      private static final com.sun.management.ThreadMXBean threadMXBean = (com.sun.management.ThreadMXBean) Management.getThreadMXBean();
  
      private final Main main;
  
+     private OptionValues graalOptions;
+ 
      /**
       * The compilation id of this task.
       */
      private final int id;
  

*** 71,82 ****
--- 74,86 ----
      /**
       * The result of this compilation task.
       */
      private CompiledMethodInfo result;
  
!     public AOTCompilationTask(Main main, OptionValues graalOptions, AOTCompiledClass holder, ResolvedJavaMethod method, AOTBackend aotBackend) {
          this.main = main;
+         this.graalOptions = graalOptions;
          this.id = ids.getAndIncrement();
          this.holder = holder;
          this.method = method;
          this.aotBackend = aotBackend;
      }

*** 89,106 ****
--- 93,110 ----
          // may include processing command line options used by the latter.
          HotSpotJVMCIRuntime.runtime();
  
          // Ensure a debug configuration for this thread is initialized
          if (Debug.isEnabled() && DebugScope.getConfig() == null) {
!             DebugEnvironment.initialize(TTY.out);
!             DebugEnvironment.ensureInitialized(graalOptions);
          }
          AOTCompiler.logCompilation(MiscUtils.uniqueMethodName(method), "Compiling");
  
          final long threadId = Thread.currentThread().getId();
  
!         final boolean printCompilation = GraalCompilerOptions.PrintCompilation.getValue(graalOptions) && !TTY.isSuppressed();
!         final boolean printAfterCompilation = GraalCompilerOptions.PrintAfterCompilation.getValue(graalOptions) && !TTY.isSuppressed();
          if (printCompilation) {
              TTY.println(getMethodDescription() + "...");
          }
  
          final long start;