--- a/src/share/vm/compiler/compileBroker.cpp	Fri Oct 11 10:38:03 2013 +0200
+++ b/src/share/vm/compiler/compileBroker.cpp	Fri Oct 11 15:41:33 2013 +0200
@@ -767,16 +767,15 @@
   // Set the interface to the current compiler(s).
   int c1_count = CompilationPolicy::policy()->compiler_count(CompLevel_simple);
   int c2_count = CompilationPolicy::policy()->compiler_count(CompLevel_full_optimization);
-
 #ifdef GRAAL
   GraalCompiler* graal = new GraalCompiler();
 #endif
-
-#if defined(GRAALVM)
+#ifdef GRAALVM
   _compilers[0] = graal;
   c1_count = 0;
   c2_count = 0;
-#elif defined(COMPILER1)
+#else // GRAALVM
+#ifdef COMPILER1
   if (c1_count > 0) {
     _compilers[0] = new Compiler();
   }
@@ -787,7 +786,7 @@
     _compilers[1] = new C2Compiler();
   }
 #endif // COMPILER2
-
+#endif // GRAALVM
 #else // SHARK
   int c1_count = 0;
   int c2_count = 1;
@@ -1054,9 +1053,10 @@
         return false;
       }
     }
+
+    // No pending or active compilations.
+    return true;
   }
-  // No pending or active compilations.
-  return true;
 }