archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-25 13:54:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

7002129: Zero and Shark fixes, 3rd

Browse source 
6970683 and 6953144 introduced changes that need to be implemented for Zero and Shark.

Reviewed-by: twisti
This commit is contained in:
Gary Benson 2010-11-23 04:33:42 -08:00 • committed by Christian Thalinger
parent 15c6dde68a
commit 7b0fb2a1e3
2 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
hotspot/src/share/vm/compiler/compileBroker.cpp
View file

@ -522,6 +522,7 @@ CompilerCounters::CompilerCounters(const char* thread_name, int instance, TRAPS)
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 @@ void CompileBroker::compilation_init() {
}
#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;