archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-15 08:34:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

6909153: Fix broken options on Zero

Browse source 
Smaller fixes to ensure that Zero still works with non-standard options.

Reviewed-by: twisti
This commit is contained in:
Gary Benson 2010-01-04 00:22:57 -08:00 • committed by Christian Thalinger
parent f64d1c0216
commit 915d9602fe
2 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1820,9 +1820,11 @@ void CompileBroker::print_times() {
CompileBroker::_t_standard_compilation.seconds(),
CompileBroker::_t_standard_compilation.seconds() / CompileBroker::_total_standard_compile_count);
tty->print_cr(" On stack replacement : %6.3f s, Average : %2.3f", CompileBroker::_t_osr_compilation.seconds(), CompileBroker::_t_osr_compilation.seconds() / CompileBroker::_total_osr_compile_count);
compiler(CompLevel_fast_compile)->print_timers();
if (compiler(CompLevel_fast_compile) != compiler(CompLevel_highest_tier)) {
compiler(CompLevel_highest_tier)->print_timers();
if (compiler(CompLevel_fast_compile)) {
compiler(CompLevel_fast_compile)->print_timers();
if (compiler(CompLevel_fast_compile) != compiler(CompLevel_highest_tier))
compiler(CompLevel_highest_tier)->print_timers();
}
tty->cr();

11
hotspot/src/share/vm/runtime/arguments.cpp
View file

@ -2756,9 +2756,16 @@ jint Arguments::parse(const JavaVMInitArgs* args) {
set_aggressive_opts_flags();
#ifdef CC_INTERP
// Biased locking is not implemented with c++ interpreter
// Clear flags not supported by the C++ interpreter
FLAG_SET_DEFAULT(ProfileInterpreter, false);
FLAG_SET_DEFAULT(UseBiasedLocking, false);
#endif /* CC_INTERP */
LP64_ONLY(FLAG_SET_DEFAULT(UseCompressedOops, false));
#endif // CC_INTERP
#ifdef ZERO
// Clear flags not supported by Zero
FLAG_SET_DEFAULT(TaggedStackInterpreter, false);
#endif // ZERO
#ifdef COMPILER2
if (!UseBiasedLocking || EmitSync != 0) {