--- a/jvmci/jdk.internal.jvmci.compiler/src/jdk/internal/jvmci/compiler/Compiler.java	Thu Sep 10 16:25:32 2015 -0700
+++ b/jvmci/jdk.internal.jvmci.compiler/src/jdk/internal/jvmci/compiler/Compiler.java	Thu Sep 10 16:25:43 2015 -0700
@@ -47,10 +47,4 @@
      * @param id a unique identifier for this compilation
      */
     void compileMethod(ResolvedJavaMethod method, int entryBCI, long jvmciEnv, int id);
-
-    /**
-     * Notifies this JVMCI compiler that the VM is running in CompileTheWorld mode and it should now
-     * perform its version of CompileTheWorld.
-     */
-    void compileTheWorld() throws Throwable;
 }

--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/CompileTheWorldMain.java	Thu Sep 10 16:25:32 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package jdk.internal.jvmci.hotspot;
-
-import jdk.internal.jvmci.compiler.Compiler;
-
-public class CompileTheWorldMain {
-    public static void main(String[] args) throws Throwable {
-        Compiler compiler = HotSpotJVMCIRuntime.runtime().getCompiler();
-        compiler.compileTheWorld();
-    }
-}

--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotJVMCICompilerConfig.java	Thu Sep 10 16:25:32 2015 -0700
+++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotJVMCICompilerConfig.java	Thu Sep 10 16:25:43 2015 -0700
@@ -38,10 +38,6 @@
             throw new JVMCIError("no JVMCI compiler selected");
         }
 
-        public void compileTheWorld() throws Throwable {
-            throw new JVMCIError("no JVMCI compiler selected");
-        }
-
         public String getCompilerName() {
             return "<none>";
         }

--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotJVMCIRuntime.java	Thu Sep 10 16:25:32 2015 -0700
+++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotJVMCIRuntime.java	Thu Sep 10 16:25:43 2015 -0700
@@ -224,14 +224,6 @@
     }
 
     /**
-     * Called from the VM.
-     */
-    @SuppressWarnings({"unused"})
-    private void compileTheWorld() throws Throwable {
-        compiler.compileTheWorld();
-    }
-
-    /**
      * Shuts down the runtime.
      *
      * Called from the VM.