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

rev 52509 : [mq]: graal2

*** 34,57 ****
  import static org.graalvm.util.CollectionsUtil.allMatch;
  
  import java.util.ListIterator;
  import java.util.concurrent.atomic.AtomicInteger;
  
- import jdk.vm.ci.code.CodeCacheProvider;
- import jdk.vm.ci.code.InstalledCode;
- import jdk.vm.ci.code.Register;
- import jdk.vm.ci.code.RegisterConfig;
- import jdk.vm.ci.code.site.Call;
- import jdk.vm.ci.code.site.ConstantReference;
- import jdk.vm.ci.code.site.DataPatch;
- import jdk.vm.ci.code.site.Infopoint;
- import jdk.vm.ci.hotspot.HotSpotCompiledCode;
- import jdk.vm.ci.hotspot.HotSpotMetaspaceConstant;
- import jdk.vm.ci.meta.DefaultProfilingInfo;
- import jdk.vm.ci.meta.ResolvedJavaMethod;
- import jdk.vm.ci.meta.TriState;
- 
  import jdk.internal.vm.compiler.collections.EconomicSet;
  import org.graalvm.compiler.code.CompilationResult;
  import org.graalvm.compiler.core.common.CompilationIdentifier;
  import org.graalvm.compiler.core.common.GraalOptions;
  import org.graalvm.compiler.core.target.Backend;
--- 34,43 ----
*** 71,80 ****
--- 57,80 ----
  import org.graalvm.compiler.phases.OptimisticOptimizations;
  import org.graalvm.compiler.phases.PhaseSuite;
  import org.graalvm.compiler.phases.tiers.Suites;
  import org.graalvm.compiler.printer.GraalDebugHandlersFactory;
  
+ import jdk.vm.ci.code.CodeCacheProvider;
+ import jdk.vm.ci.code.InstalledCode;
+ import jdk.vm.ci.code.Register;
+ import jdk.vm.ci.code.RegisterConfig;
+ import jdk.vm.ci.code.site.Call;
+ import jdk.vm.ci.code.site.ConstantReference;
+ import jdk.vm.ci.code.site.DataPatch;
+ import jdk.vm.ci.code.site.Infopoint;
+ import jdk.vm.ci.hotspot.HotSpotCompiledCode;
+ import jdk.vm.ci.hotspot.HotSpotMetaspaceConstant;
+ import jdk.vm.ci.meta.DefaultProfilingInfo;
+ import jdk.vm.ci.meta.ResolvedJavaMethod;
+ import jdk.vm.ci.meta.TriState;
+ 
  //JaCoCo Exclude
  
  /**
   * Base class for implementing some low level code providing the out-of-line slow path for a snippet
   * and/or a callee saved call to a HotSpot C/C++ runtime function or even a another compiled Java
*** 200,210 ****
                      try (DebugContext.Scope s = debug.scope("CodeInstall", compResult);
                                      DebugContext.Activation a = debug.activate()) {
                          assert destroyedCallerRegisters != null;
                          // Add a GeneratePIC check here later, we don't want to install
                          // code if we don't have a corresponding VM global symbol.
!                         HotSpotCompiledCode compiledCode = HotSpotCompiledCodeBuilder.createCompiledCode(codeCache, null, null, compResult);
                          code = codeCache.installCode(null, compiledCode, null, null, false);
                      } catch (Throwable e) {
                          throw debug.handle(e);
                      }
                  } catch (Throwable e) {
--- 200,210 ----
                      try (DebugContext.Scope s = debug.scope("CodeInstall", compResult);
                                      DebugContext.Activation a = debug.activate()) {
                          assert destroyedCallerRegisters != null;
                          // Add a GeneratePIC check here later, we don't want to install
                          // code if we don't have a corresponding VM global symbol.
!                         HotSpotCompiledCode compiledCode = HotSpotCompiledCodeBuilder.createCompiledCode(codeCache, null, null, compResult, options);
                          code = codeCache.installCode(null, compiledCode, null, null, false);
                      } catch (Throwable e) {
                          throw debug.handle(e);
                      }
                  } catch (Throwable e) {