# HG changeset patch
# User Tom Rodriguez <tom.rodriguez@oracle.com>
# Date 1441987169 25200
# Node ID 0b85ebe05f88a959ffb8a4e54c3408a301ff0e08
# Parent  50da094850fb99b356fe4d95da9c5f28cc617168
Update jvmci import: Move CTW command into Graal

diff -r 50da094850fb -r 0b85ebe05f88 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	Thu Sep 10 10:13:16 2015 -0700
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompileTheWorld.java	Fri Sep 11 08:59:29 2015 -0700
@@ -516,4 +516,8 @@
         return true;
     }
 
+    public static void main(String[] args) throws Throwable {
+        HotSpotGraalCompiler compiler = (HotSpotGraalCompiler) HotSpotJVMCIRuntime.runtime().getCompiler();
+        compiler.compileTheWorld();
+    }
 }
diff -r 50da094850fb -r 0b85ebe05f88 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	Thu Sep 10 10:13:16 2015 -0700
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalCompiler.java	Fri Sep 11 08:59:29 2015 -0700
@@ -72,7 +72,6 @@
         }
     }
 
-    @Override
     public void compileTheWorld() throws Throwable {
         CompilerToVM compilerToVM = jvmciRuntime.getCompilerToVM();
         int iterations = CompileTheWorld.Options.CompileTheWorldIterations.getValue();
diff -r 50da094850fb -r 0b85ebe05f88 mx.graal/mx_graal.py
--- a/mx.graal/mx_graal.py	Thu Sep 10 10:13:16 2015 -0700
+++ b/mx.graal/mx_graal.py	Fri Sep 11 08:59:29 2015 -0700
@@ -219,7 +219,7 @@
     if isJVMCIEnabled(vm_):
         if vm_ == 'jvmci':
             vmargs += ['-XX:+BootstrapJVMCI']
-        vmargs += ['-G:CompileTheWorldClasspath=' + jar, '-XX:-UseJVMCIClassLoader', 'jdk.internal.jvmci.hotspot.CompileTheWorldMain']
+        vmargs += ['-G:CompileTheWorldClasspath=' + jar, '-XX:-UseJVMCIClassLoader', 'com.oracle.graal.hotspot.CompileTheWorld']
     else:
         vmargs += ['-XX:+CompileTheWorld', '-Xbootclasspath/p:' + jar]
 
diff -r 50da094850fb -r 0b85ebe05f88 mx.graal/suite.py
--- a/mx.graal/suite.py	Thu Sep 10 10:13:16 2015 -0700
+++ b/mx.graal/suite.py	Fri Sep 11 08:59:29 2015 -0700
@@ -6,7 +6,7 @@
     "suites": [
             {
                "name" : "jvmci",
-               "version" : "10a9e989850ea4600b5bd677dfbf5bfc0a0d3753",
+               "version" : "94ba89d569367489f17fc298e25c43eeaec96a22",
                "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"},