--- a/hotspot/src/share/vm/compiler/compileBroker.cpp Fri Nov 19 17:01:34 2010 -0800
+++ b/hotspot/src/share/vm/compiler/compileBroker.cpp Tue Nov 23 04:33:42 2010 -0800
@@ -522,6 +522,7 @@
void CompileBroker::compilation_init() {
_last_method_compiled[0] = '\0';
+#ifndef SHARK
// 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);
@@ -537,13 +538,12 @@
}
#endif // COMPILER2
-#ifdef SHARK
-#if defined(COMPILER1) || defined(COMPILER2)
-#error "Can't use COMPILER1 or COMPILER2 with shark"
-#endif
- _compilers[0] = new SharkCompiler();
- _compilers[1] = _compilers[0];
-#endif
+#else // SHARK
+ int c1_count = 0;
+ int c2_count = 1;
+
+ _compilers[1] = new SharkCompiler();
+#endif // SHARK
// Initialize the CompileTask free list
_task_free_list = NULL;