--- a/src/share/vm/prims/jni.cpp	Wed Mar 25 16:16:36 2015 +0100
+++ b/src/share/vm/prims/jni.cpp	Wed Mar 25 11:47:49 2015 -0700
@@ -5199,7 +5199,7 @@
     *vm = (JavaVM *)(&main_vm);
     *(JNIEnv**)penv = thread->jni_environment();
 
-#if defined(GRAAL) && !defined(PRODUCT)
+#if defined(GRAAL)
     // We turn off CompileTheWorld so that compilation requests are not ignored during bootstrap or that Graal can be compiled by C1/C2.
     bool doCTW = CompileTheWorld;
     CompileTheWorld = false;
@@ -5210,14 +5210,14 @@
     if (FLAG_IS_DEFAULT(BootstrapGraal) ? !TieredCompilation : BootstrapGraal) {
       GraalCompiler::instance()->bootstrap();
     }
-#elif defined(GRAAL) && !defined(PRODUCT)
+#elif defined(GRAAL)
     if (doCTW) {
       // required for hosted CTW.
       CompilationPolicy::completed_vm_startup();
     }
 #endif
 
-#if defined(GRAAL) && !defined(PRODUCT)
+#if defined(GRAAL)
     if (doCTW) {
       GraalCompiler::instance()->compile_the_world();
     }