# HG changeset patch
# User Roland Schatz <roland.schatz@oracle.com>
# Date 1445429146 -7200
# Node ID 3e8357b49024cb168ab5ebd511d8b5c03c068f75
# Parent  bca707b69cd715814cc9227363b31141a04cfccf
Update jvmci import: Rename Compiler to JVMCICompiler.

diff -r bca707b69cd7 -r 3e8357b49024 graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java	Wed Oct 21 12:52:32 2015 +0200
+++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java	Wed Oct 21 14:05:46 2015 +0200
@@ -25,7 +25,7 @@
 import static com.oracle.graal.compiler.GraalCompiler.getProfilingInfo;
 import static com.oracle.graal.nodes.ConstantNode.getConstantNodes;
 import static jdk.vm.ci.code.CodeUtil.getCallingConvention;
-import static jdk.vm.ci.compiler.Compiler.PrintCompilation;
+import static jdk.vm.ci.runtime.JVMCICompiler.PrintCompilation;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
diff -r bca707b69cd7 -r 3e8357b49024 graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/CompileTheWorldTest.java
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/CompileTheWorldTest.java	Wed Oct 21 12:52:32 2015 +0200
+++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/CompileTheWorldTest.java	Wed Oct 21 14:05:46 2015 +0200
@@ -22,7 +22,7 @@
  */
 package com.oracle.graal.hotspot.test;
 
-import static jdk.vm.ci.compiler.Compiler.ExitVMOnException;
+import static jdk.vm.ci.runtime.JVMCICompiler.ExitVMOnException;
 import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
 import jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider;
 
diff -r bca707b69cd7 -r 3e8357b49024 graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/MemoryUsageBenchmark.java
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/MemoryUsageBenchmark.java	Wed Oct 21 12:52:32 2015 +0200
+++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/MemoryUsageBenchmark.java	Wed Oct 21 14:05:46 2015 +0200
@@ -23,11 +23,11 @@
 package com.oracle.graal.hotspot.test;
 
 import static com.oracle.graal.debug.internal.MemUseTrackerImpl.getCurrentThreadAllocatedBytes;
-import jdk.vm.ci.compiler.Compiler;
 import jdk.vm.ci.hotspot.HotSpotCompilationRequest;
 import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
 import jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider;
 import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod;
+import jdk.vm.ci.runtime.JVMCICompiler;
 
 import com.oracle.graal.api.runtime.Graal;
 import com.oracle.graal.compiler.test.AllocSpy;
@@ -141,7 +141,7 @@
 
         try (MemoryUsageCloseable c = label == null ? null : new MemoryUsageCloseable(label)) {
             HotSpotJVMCIRuntimeProvider runtime = HotSpotJVMCIRuntime.runtime();
-            int entryBCI = Compiler.INVOCATION_ENTRY_BCI;
+            int entryBCI = JVMCICompiler.INVOCATION_ENTRY_BCI;
             HotSpotCompilationRequest request = new HotSpotCompilationRequest(method, entryBCI, jvmciEnv);
             CompilationTask task = new CompilationTask(runtime, (HotSpotGraalCompiler) runtime.getCompiler(), request, false);
             task.runCompilation();
@@ -159,7 +159,7 @@
             long jvmciEnv = 0L;
             try (AllocSpy as = AllocSpy.open(methodName)) {
                 HotSpotJVMCIRuntimeProvider runtime = HotSpotJVMCIRuntime.runtime();
-                HotSpotCompilationRequest request = new HotSpotCompilationRequest(method, Compiler.INVOCATION_ENTRY_BCI, jvmciEnv);
+                HotSpotCompilationRequest request = new HotSpotCompilationRequest(method, JVMCICompiler.INVOCATION_ENTRY_BCI, jvmciEnv);
                 CompilationTask task = new CompilationTask(runtime, (HotSpotGraalCompiler) runtime.getCompiler(), request, false);
                 task.runCompilation();
             }
diff -r bca707b69cd7 -r 3e8357b49024 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java	Wed Oct 21 12:52:32 2015 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java	Wed Oct 21 14:05:46 2015 +0200
@@ -22,13 +22,13 @@
  */
 package com.oracle.graal.hotspot;
 
-import static jdk.vm.ci.compiler.Compiler.ExitVMOnBailout;
-import static jdk.vm.ci.compiler.Compiler.ExitVMOnException;
-import static jdk.vm.ci.compiler.Compiler.PrintAfterCompilation;
-import static jdk.vm.ci.compiler.Compiler.PrintBailout;
-import static jdk.vm.ci.compiler.Compiler.PrintCompilation;
-import static jdk.vm.ci.compiler.Compiler.PrintFilter;
-import static jdk.vm.ci.compiler.Compiler.PrintStackTraceOnException;
+import static jdk.vm.ci.runtime.JVMCICompiler.ExitVMOnBailout;
+import static jdk.vm.ci.runtime.JVMCICompiler.ExitVMOnException;
+import static jdk.vm.ci.runtime.JVMCICompiler.PrintAfterCompilation;
+import static jdk.vm.ci.runtime.JVMCICompiler.PrintBailout;
+import static jdk.vm.ci.runtime.JVMCICompiler.PrintCompilation;
+import static jdk.vm.ci.runtime.JVMCICompiler.PrintFilter;
+import static jdk.vm.ci.runtime.JVMCICompiler.PrintStackTraceOnException;
 
 import java.lang.reflect.Field;
 import java.util.concurrent.TimeUnit;
@@ -37,7 +37,6 @@
 import jdk.vm.ci.code.CodeCacheProvider;
 import jdk.vm.ci.code.CompilationResult;
 import jdk.vm.ci.code.InstalledCode;
-import jdk.vm.ci.compiler.Compiler;
 import jdk.vm.ci.hotspot.HotSpotCodeCacheProvider;
 import jdk.vm.ci.hotspot.HotSpotCompilationRequest;
 import jdk.vm.ci.hotspot.HotSpotInstalledCode;
@@ -49,6 +48,7 @@
 import jdk.vm.ci.hotspot.events.EventProvider;
 import jdk.vm.ci.hotspot.events.EventProvider.CompilationEvent;
 import jdk.vm.ci.hotspot.events.EventProvider.CompilerFailureEvent;
+import jdk.vm.ci.runtime.JVMCICompiler;
 import jdk.vm.ci.service.Services;
 import sun.misc.Unsafe;
 
@@ -156,7 +156,7 @@
         long startCompilationTime = System.nanoTime();
         HotSpotInstalledCode installedCode = null;
         int entryBCI = getEntryBCI();
-        final boolean isOSR = entryBCI != Compiler.INVOCATION_ENTRY_BCI;
+        final boolean isOSR = entryBCI != JVMCICompiler.INVOCATION_ENTRY_BCI;
         HotSpotResolvedJavaMethod method = getMethod();
 
         // Log a compilation event.
@@ -280,7 +280,7 @@
             if ((config.ciTime || config.ciTimeEach) && installedCode != null) {
                 long timeUnitsPerSecond = TimeUnit.NANOSECONDS.convert(1, TimeUnit.SECONDS);
                 final HotSpotCodeCacheProvider codeCache = (HotSpotCodeCacheProvider) jvmciRuntime.getHostJVMCIBackend().getCodeCache();
-                codeCache.notifyCompilationStatistics(getId(), method, entryBCI != Compiler.INVOCATION_ENTRY_BCI, compiledBytecodes, compilationTime, timeUnitsPerSecond, installedCode);
+                codeCache.notifyCompilationStatistics(getId(), method, entryBCI != JVMCICompiler.INVOCATION_ENTRY_BCI, compiledBytecodes, compilationTime, timeUnitsPerSecond, installedCode);
             }
         }
     }
@@ -302,7 +302,7 @@
     private String getMethodDescription() {
         HotSpotResolvedJavaMethod method = getMethod();
         return String.format("%-6d JVMCI %-70s %-45s %-50s %s", getId(), method.getDeclaringClass().getName(), method.getName(), method.getSignature().toMethodDescriptor(),
-                        getEntryBCI() == Compiler.INVOCATION_ENTRY_BCI ? "" : "(OSR@" + getEntryBCI() + ") ");
+                        getEntryBCI() == JVMCICompiler.INVOCATION_ENTRY_BCI ? "" : "(OSR@" + getEntryBCI() + ") ");
     }
 
     @SuppressWarnings("try")
@@ -319,6 +319,6 @@
 
     @Override
     public String toString() {
-        return "Compilation[id=" + getId() + ", " + getMethod().format("%H.%n(%p)") + (getEntryBCI() == Compiler.INVOCATION_ENTRY_BCI ? "" : "@" + getEntryBCI()) + "]";
+        return "Compilation[id=" + getId() + ", " + getMethod().format("%H.%n(%p)") + (getEntryBCI() == JVMCICompiler.INVOCATION_ENTRY_BCI ? "" : "@" + getEntryBCI()) + "]";
     }
 }
diff -r bca707b69cd7 -r 3e8357b49024 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompileTheWorld.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompileTheWorld.java	Wed Oct 21 12:52:32 2015 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompileTheWorld.java	Wed Oct 21 14:05:46 2015 +0200
@@ -29,10 +29,10 @@
 import static com.oracle.graal.hotspot.CompileTheWorldOptions.CompileTheWorldStartAt;
 import static com.oracle.graal.hotspot.CompileTheWorldOptions.CompileTheWorldStopAt;
 import static com.oracle.graal.hotspot.CompileTheWorldOptions.CompileTheWorldVerbose;
-import static jdk.vm.ci.compiler.Compiler.ExitVMOnException;
-import static jdk.vm.ci.compiler.Compiler.PrintBailout;
-import static jdk.vm.ci.compiler.Compiler.PrintStackTraceOnException;
 import static jdk.vm.ci.hotspot.HotSpotVMConfig.config;
+import static jdk.vm.ci.runtime.JVMCICompiler.ExitVMOnException;
+import static jdk.vm.ci.runtime.JVMCICompiler.PrintBailout;
+import static jdk.vm.ci.runtime.JVMCICompiler.PrintStackTraceOnException;
 
 import java.io.Closeable;
 import java.io.File;
@@ -63,7 +63,6 @@
 import java.util.jar.JarFile;
 import java.util.stream.Collectors;
 
-import jdk.vm.ci.compiler.Compiler;
 import jdk.vm.ci.hotspot.HotSpotCompilationRequest;
 import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
 import jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider;
@@ -78,6 +77,7 @@
 import jdk.vm.ci.options.OptionsParser;
 import jdk.vm.ci.options.OptionsParser.OptionConsumer;
 import jdk.vm.ci.runtime.JVMCI;
+import jdk.vm.ci.runtime.JVMCICompiler;
 
 import com.oracle.graal.bytecode.Bytecodes;
 import com.oracle.graal.compiler.CompilerThreadFactory;
@@ -480,7 +480,7 @@
             // config debug override.
             HotSpotResolvedJavaMethod dummyMethod = (HotSpotResolvedJavaMethod) JVMCI.getRuntime().getHostJVMCIBackend().getMetaAccess().lookupJavaMethod(
                             CompileTheWorld.class.getDeclaredMethod("dummy"));
-            int entryBCI = Compiler.INVOCATION_ENTRY_BCI;
+            int entryBCI = JVMCICompiler.INVOCATION_ENTRY_BCI;
             CompilationTask task = new CompilationTask(jvmciRuntime, compiler, new HotSpotCompilationRequest(dummyMethod, entryBCI, 0L), false);
             task.runCompilation();
         } catch (NoSuchMethodException | SecurityException e1) {
@@ -674,7 +674,7 @@
         try {
             long start = System.currentTimeMillis();
             long allocatedAtStart = MemUseTrackerImpl.getCurrentThreadAllocatedBytes();
-            int entryBCI = Compiler.INVOCATION_ENTRY_BCI;
+            int entryBCI = JVMCICompiler.INVOCATION_ENTRY_BCI;
             HotSpotCompilationRequest request = new HotSpotCompilationRequest(method, entryBCI, 0L);
             CompilationTask task = new CompilationTask(jvmciRuntime, compiler, request, false);
             task.runCompilation();
diff -r bca707b69cd7 -r 3e8357b49024 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/DefaultHotSpotGraalCompilerFactory.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/DefaultHotSpotGraalCompilerFactory.java	Wed Oct 21 12:52:32 2015 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/DefaultHotSpotGraalCompilerFactory.java	Wed Oct 21 14:05:46 2015 +0200
@@ -25,13 +25,13 @@
 import java.util.IdentityHashMap;
 
 import jdk.vm.ci.code.Architecture;
-import jdk.vm.ci.compiler.CompilerFactory;
+import jdk.vm.ci.runtime.JVMCICompilerFactory;
 import jdk.vm.ci.service.ServiceProvider;
 
 import com.oracle.graal.compiler.phases.BasicCompilerConfiguration;
 import com.oracle.graal.phases.tiers.CompilerConfiguration;
 
-@ServiceProvider(CompilerFactory.class)
+@ServiceProvider(JVMCICompilerFactory.class)
 public class DefaultHotSpotGraalCompilerFactory extends HotSpotGraalCompilerFactory {
 
     private static IdentityHashMap<Class<? extends Architecture>, HotSpotBackendFactory> backends = new IdentityHashMap<>();
diff -r bca707b69cd7 -r 3e8357b49024 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/EconomyHotSpotGraalCompilerFactory.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/EconomyHotSpotGraalCompilerFactory.java	Wed Oct 21 12:52:32 2015 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/EconomyHotSpotGraalCompilerFactory.java	Wed Oct 21 14:05:46 2015 +0200
@@ -22,13 +22,13 @@
  */
 package com.oracle.graal.hotspot;
 
-import jdk.vm.ci.compiler.CompilerFactory;
+import jdk.vm.ci.runtime.JVMCICompilerFactory;
 import jdk.vm.ci.service.ServiceProvider;
 
 import com.oracle.graal.compiler.phases.EconomyCompilerConfiguration;
 import com.oracle.graal.phases.tiers.CompilerConfiguration;
 
-@ServiceProvider(CompilerFactory.class)
+@ServiceProvider(JVMCICompilerFactory.class)
 public class EconomyHotSpotGraalCompilerFactory extends DefaultHotSpotGraalCompilerFactory {
 
     @Override
diff -r bca707b69cd7 -r 3e8357b49024 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalCompiler.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalCompiler.java	Wed Oct 21 12:52:32 2015 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalCompiler.java	Wed Oct 21 14:05:46 2015 +0200
@@ -30,7 +30,6 @@
 import jdk.vm.ci.code.CallingConvention.Type;
 import jdk.vm.ci.code.CompilationRequest;
 import jdk.vm.ci.code.CompilationResult;
-import jdk.vm.ci.compiler.Compiler;
 import jdk.vm.ci.hotspot.HotSpotCodeCacheProvider;
 import jdk.vm.ci.hotspot.HotSpotCompilationRequest;
 import jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider;
@@ -38,6 +37,7 @@
 import jdk.vm.ci.meta.ProfilingInfo;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.SpeculationLog;
+import jdk.vm.ci.runtime.JVMCICompiler;
 
 import com.oracle.graal.compiler.GraalCompiler;
 import com.oracle.graal.debug.Debug;
@@ -64,7 +64,7 @@
 import com.oracle.graal.phases.tiers.HighTierContext;
 import com.oracle.graal.phases.tiers.Suites;
 
-public class HotSpotGraalCompiler implements Compiler {
+public class HotSpotGraalCompiler implements JVMCICompiler {
 
     private final HotSpotJVMCIRuntimeProvider jvmciRuntime;
     private final HotSpotGraalRuntimeProvider graalRuntime;
@@ -107,7 +107,7 @@
     public CompilationResult compile(ResolvedJavaMethod method, int entryBCI, boolean mustRecordMethodInlining) {
         HotSpotBackend backend = graalRuntime.getHostBackend();
         HotSpotProviders providers = backend.getProviders();
-        final boolean isOSR = entryBCI != Compiler.INVOCATION_ENTRY_BCI;
+        final boolean isOSR = entryBCI != JVMCICompiler.INVOCATION_ENTRY_BCI;
         StructuredGraph graph = method.isNative() || isOSR ? null : getIntrinsicGraph(method, providers);
 
         if (graph == null) {
diff -r bca707b69cd7 -r 3e8357b49024 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalCompilerFactory.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalCompilerFactory.java	Wed Oct 21 12:52:32 2015 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalCompilerFactory.java	Wed Oct 21 14:05:46 2015 +0200
@@ -24,18 +24,18 @@
 
 import static jdk.vm.ci.inittimer.InitTimer.timer;
 import jdk.vm.ci.code.Architecture;
-import jdk.vm.ci.compiler.CompilerFactory;
 import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
 import jdk.vm.ci.inittimer.InitTimer;
 import jdk.vm.ci.options.Option;
 import jdk.vm.ci.options.OptionType;
 import jdk.vm.ci.options.OptionValue;
+import jdk.vm.ci.runtime.JVMCICompilerFactory;
 import jdk.vm.ci.runtime.JVMCIRuntime;
 import jdk.vm.ci.service.Services;
 
 import com.oracle.graal.phases.tiers.CompilerConfiguration;
 
-public abstract class HotSpotGraalCompilerFactory implements CompilerFactory {
+public abstract class HotSpotGraalCompilerFactory implements JVMCICompilerFactory {
 
     static class Options {
 
diff -r bca707b69cd7 -r 3e8357b49024 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntimeAccess.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntimeAccess.java	Wed Oct 21 12:52:32 2015 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntimeAccess.java	Wed Oct 21 14:05:46 2015 +0200
@@ -23,11 +23,11 @@
 package com.oracle.graal.hotspot;
 
 import jdk.vm.ci.common.JVMCIError;
-import jdk.vm.ci.compiler.CompilerFactory;
 import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
 import jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider;
 import jdk.vm.ci.options.Option;
 import jdk.vm.ci.options.OptionValue;
+import jdk.vm.ci.runtime.JVMCICompilerFactory;
 import jdk.vm.ci.service.ServiceProvider;
 import jdk.vm.ci.service.Services;
 
@@ -56,7 +56,7 @@
             // default: fall back to the JVMCI system compiler
             return (HotSpotGraalCompiler) jvmciRuntime.getCompiler();
         } else {
-            for (CompilerFactory factory : Services.load(CompilerFactory.class)) {
+            for (JVMCICompilerFactory factory : Services.load(JVMCICompilerFactory.class)) {
                 if (factory instanceof HotSpotGraalCompilerFactory) {
                     HotSpotGraalCompilerFactory graalFactory = (HotSpotGraalCompilerFactory) factory;
                     if (config.equals(factory.getCompilerName())) {
diff -r bca707b69cd7 -r 3e8357b49024 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/phases/OnStackReplacementPhase.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/phases/OnStackReplacementPhase.java	Wed Oct 21 12:52:32 2015 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/phases/OnStackReplacementPhase.java	Wed Oct 21 14:05:46 2015 +0200
@@ -25,7 +25,7 @@
 import static com.oracle.graal.phases.common.DeadCodeEliminationPhase.Optionality.Required;
 import jdk.vm.ci.code.BailoutException;
 import jdk.vm.ci.common.JVMCIError;
-import jdk.vm.ci.compiler.Compiler;
+import jdk.vm.ci.runtime.JVMCICompiler;
 
 import com.oracle.graal.debug.Debug;
 import com.oracle.graal.graph.Node;
@@ -53,7 +53,7 @@
 
     @Override
     protected void run(StructuredGraph graph) {
-        if (graph.getEntryBCI() == Compiler.INVOCATION_ENTRY_BCI) {
+        if (graph.getEntryBCI() == JVMCICompiler.INVOCATION_ENTRY_BCI) {
             // This happens during inlining in a OSR method, because the same phase plan will be
             // used.
             return;
diff -r bca707b69cd7 -r 3e8357b49024 graal/com.oracle.graal.java/src/com/oracle/graal/java/BytecodeParser.java
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/BytecodeParser.java	Wed Oct 21 12:52:32 2015 +0200
+++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/BytecodeParser.java	Wed Oct 21 14:05:46 2015 +0200
@@ -267,7 +267,6 @@
 import jdk.vm.ci.code.CodeUtil;
 import jdk.vm.ci.code.InfopointReason;
 import jdk.vm.ci.common.JVMCIError;
-import jdk.vm.ci.compiler.Compiler;
 import jdk.vm.ci.meta.ConstantPool;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.DeoptimizationAction;
@@ -288,6 +287,7 @@
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.ResolvedJavaType;
 import jdk.vm.ci.meta.TriState;
+import jdk.vm.ci.runtime.JVMCICompiler;
 
 import com.oracle.graal.bytecode.BytecodeLookupSwitch;
 import com.oracle.graal.bytecode.BytecodeStream;
@@ -1853,7 +1853,7 @@
     protected void parseAndInlineCallee(ResolvedJavaMethod targetMethod, ValueNode[] args, IntrinsicContext calleeIntrinsicContext) {
         try (IntrinsicScope s = calleeIntrinsicContext != null && !parsingIntrinsic() ? new IntrinsicScope(this, targetMethod.getSignature().toParameterKinds(!targetMethod.isStatic()), args) : null) {
 
-            BytecodeParser parser = graphBuilderInstance.createBytecodeParser(graph, this, targetMethod, Compiler.INVOCATION_ENTRY_BCI, calleeIntrinsicContext);
+            BytecodeParser parser = graphBuilderInstance.createBytecodeParser(graph, this, targetMethod, JVMCICompiler.INVOCATION_ENTRY_BCI, calleeIntrinsicContext);
             FrameStateBuilder startFrameState = new FrameStateBuilder(parser, targetMethod, graph);
             if (!targetMethod.isStatic()) {
                 args[0] = nullCheckedValue(args[0]);
diff -r bca707b69cd7 -r 3e8357b49024 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/StructuredGraph.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/StructuredGraph.java	Wed Oct 21 12:52:32 2015 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/StructuredGraph.java	Wed Oct 21 14:05:46 2015 +0200
@@ -30,12 +30,12 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Consumer;
 
-import jdk.vm.ci.compiler.Compiler;
 import jdk.vm.ci.meta.Assumptions;
 import jdk.vm.ci.meta.Assumptions.Assumption;
 import jdk.vm.ci.meta.JavaMethod;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.SpeculationLog;
+import jdk.vm.ci.runtime.JVMCICompiler;
 
 import com.oracle.graal.compiler.common.type.Stamp;
 import com.oracle.graal.debug.JavaMethodContext;
@@ -154,19 +154,19 @@
      * start} node.
      */
     public StructuredGraph(String name, ResolvedJavaMethod method, AllowAssumptions allowAssumptions) {
-        this(name, method, uniqueGraphIds.incrementAndGet(), Compiler.INVOCATION_ENTRY_BCI, allowAssumptions, null);
+        this(name, method, uniqueGraphIds.incrementAndGet(), JVMCICompiler.INVOCATION_ENTRY_BCI, allowAssumptions, null);
     }
 
     public StructuredGraph(String name, ResolvedJavaMethod method, AllowAssumptions allowAssumptions, SpeculationLog speculationLog) {
-        this(name, method, uniqueGraphIds.incrementAndGet(), Compiler.INVOCATION_ENTRY_BCI, allowAssumptions, speculationLog);
+        this(name, method, uniqueGraphIds.incrementAndGet(), JVMCICompiler.INVOCATION_ENTRY_BCI, allowAssumptions, speculationLog);
     }
 
     public StructuredGraph(ResolvedJavaMethod method, AllowAssumptions allowAssumptions) {
-        this(null, method, uniqueGraphIds.incrementAndGet(), Compiler.INVOCATION_ENTRY_BCI, allowAssumptions, null);
+        this(null, method, uniqueGraphIds.incrementAndGet(), JVMCICompiler.INVOCATION_ENTRY_BCI, allowAssumptions, null);
     }
 
     public StructuredGraph(ResolvedJavaMethod method, AllowAssumptions allowAssumptions, SpeculationLog speculationLog) {
-        this(null, method, uniqueGraphIds.incrementAndGet(), Compiler.INVOCATION_ENTRY_BCI, allowAssumptions, speculationLog);
+        this(null, method, uniqueGraphIds.incrementAndGet(), JVMCICompiler.INVOCATION_ENTRY_BCI, allowAssumptions, speculationLog);
     }
 
     public StructuredGraph(ResolvedJavaMethod method, int entryBCI, AllowAssumptions allowAssumptions, SpeculationLog speculationLog) {
@@ -237,7 +237,7 @@
     }
 
     public boolean isOSR() {
-        return entryBCI != Compiler.INVOCATION_ENTRY_BCI;
+        return entryBCI != JVMCICompiler.INVOCATION_ENTRY_BCI;
     }
 
     public long graphId() {
diff -r bca707b69cd7 -r 3e8357b49024 graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/LazyInitializationTest.java
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/LazyInitializationTest.java	Wed Oct 21 12:52:32 2015 +0200
+++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/LazyInitializationTest.java	Wed Oct 21 14:05:46 2015 +0200
@@ -30,10 +30,10 @@
 import java.util.HashSet;
 import java.util.List;
 
-import jdk.vm.ci.compiler.CompilerFactory;
 import jdk.vm.ci.options.OptionDescriptor;
 import jdk.vm.ci.options.OptionDescriptors;
 import jdk.vm.ci.options.OptionValue;
+import jdk.vm.ci.runtime.JVMCICompilerFactory;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -166,7 +166,7 @@
             return true;
         }
 
-        if (CompilerFactory.class.isAssignableFrom(cls)) {
+        if (JVMCICompilerFactory.class.isAssignableFrom(cls)) {
             // The compiler factories have to be loaded and instantiated by the JVMCI.
             return true;
         }
diff -r bca707b69cd7 -r 3e8357b49024 graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/TraceCompilationFailureListener.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/TraceCompilationFailureListener.java	Wed Oct 21 12:52:32 2015 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/TraceCompilationFailureListener.java	Wed Oct 21 14:05:46 2015 +0200
@@ -22,7 +22,7 @@
  */
 package com.oracle.graal.truffle.debug;
 
-import static jdk.vm.ci.compiler.Compiler.PrintBailout;
+import static jdk.vm.ci.runtime.JVMCICompiler.PrintBailout;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
diff -r bca707b69cd7 -r 3e8357b49024 mx.graal/suite.py
--- a/mx.graal/suite.py	Wed Oct 21 12:52:32 2015 +0200
+++ b/mx.graal/suite.py	Wed Oct 21 14:05:46 2015 +0200
@@ -6,7 +6,7 @@
     "suites": [
             {
                "name" : "jvmci",
-               "version" : "ce6b9837f602c25754408c2cd9c413e36bfa8593",
+               "version" : "57646377e4808098e3b8aa4d7295b5b1ada8ed94",
                "urls" : [
                     {"url" : "http://lafo.ssw.uni-linz.ac.at/hg/graal-jvmci-8", "kind" : "hg"},
                     {"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"},