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

rev 52509 : [mq]: graal

*** 26,37 ****
  
  import static jdk.vm.ci.common.InitTimer.timer;
  import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.runtime;
  import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
  import static org.graalvm.compiler.core.common.GraalOptions.HotSpotPrintInlining;
- import static org.graalvm.compiler.debug.DebugContext.DEFAULT_LOG_STREAM;
  
  import java.util.ArrayList;
  import java.util.EnumMap;
  import java.util.List;
  import java.util.Map;
  import java.util.concurrent.atomic.AtomicReference;
--- 26,37 ----
  
  import static jdk.vm.ci.common.InitTimer.timer;
  import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.runtime;
  import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
  import static org.graalvm.compiler.core.common.GraalOptions.HotSpotPrintInlining;
  
+ import java.io.PrintStream;
  import java.util.ArrayList;
  import java.util.EnumMap;
  import java.util.List;
  import java.util.Map;
  import java.util.concurrent.atomic.AtomicReference;
*** 274,284 ****
      public GraalHotSpotVMConfig getVMConfig() {
          return config;
      }
  
      @Override
!     public DebugContext openDebugContext(OptionValues compilationOptions, CompilationIdentifier compilationId, Object compilable, Iterable<DebugHandlersFactory> factories) {
          if (management != null && management.poll(false) != null) {
              if (compilable instanceof HotSpotResolvedJavaMethod) {
                  HotSpotResolvedObjectType type = ((HotSpotResolvedJavaMethod) compilable).getDeclaringClass();
                  if (type instanceof HotSpotResolvedJavaType) {
                      Class<?> clazz = runtime().getMirror(type);
--- 274,284 ----
      public GraalHotSpotVMConfig getVMConfig() {
          return config;
      }
  
      @Override
!     public DebugContext openDebugContext(OptionValues compilationOptions, CompilationIdentifier compilationId, Object compilable, Iterable<DebugHandlersFactory> factories, PrintStream logStream) {
          if (management != null && management.poll(false) != null) {
              if (compilable instanceof HotSpotResolvedJavaMethod) {
                  HotSpotResolvedObjectType type = ((HotSpotResolvedJavaMethod) compilable).getDeclaringClass();
                  if (type instanceof HotSpotResolvedJavaType) {
                      Class<?> clazz = runtime().getMirror(type);
*** 292,302 ****
                      }
                  }
              }
          }
          Description description = new Description(compilable, compilationId.toString(CompilationIdentifier.Verbosity.ID));
!         return DebugContext.create(compilationOptions, description, metricValues, DEFAULT_LOG_STREAM, factories);
      }
  
      @Override
      public OptionValues getOptions() {
          return optionsRef.get();
--- 292,302 ----
                      }
                  }
              }
          }
          Description description = new Description(compilable, compilationId.toString(CompilationIdentifier.Verbosity.ID));
!         return DebugContext.create(compilationOptions, description, metricValues, logStream, factories);
      }
  
      @Override
      public OptionValues getOptions() {
          return optionsRef.get();