1.1 --- a/src/share/vm/code/nmethod.cpp Fri Dec 06 09:41:57 2013 -0800
1.2 +++ b/src/share/vm/code/nmethod.cpp Fri Dec 06 12:11:51 2013 -0800
1.3 @@ -459,7 +459,7 @@
1.4
1.5 // Fill in default values for various flag fields
1.6 void nmethod::init_defaults() {
1.7 - _state = alive;
1.8 + _state = in_use;
1.9 _marked_for_reclamation = 0;
1.10 _has_flushed_dependencies = 0;
1.11 _has_unsafe_access = 0;
1.12 @@ -1660,8 +1660,8 @@
1.13 CompiledICHolder* cichk_oop = ic->cached_icholder();
1.14 if (cichk_oop->holder_method()->method_holder()->is_loader_alive(is_alive) &&
1.15 cichk_oop->holder_klass()->is_loader_alive(is_alive)) {
1.16 - continue;
1.17 - }
1.18 + continue;
1.19 + }
1.20 } else {
1.21 Metadata* ic_oop = ic->cached_metadata();
1.22 if (ic_oop != NULL) {
1.23 @@ -1677,8 +1677,8 @@
1.24 ShouldNotReachHere();
1.25 }
1.26 }
1.27 - }
1.28 - ic->set_to_clean();
1.29 + }
1.30 + ic->set_to_clean();
1.31 }
1.32 }
1.33 }
1.34 @@ -2393,8 +2393,8 @@
1.35
1.36 void nmethod::verify_interrupt_point(address call_site) {
1.37 // Verify IC only when nmethod installation is finished.
1.38 - bool is_installed = (method()->code() == this) // nmethod is in state 'alive' and installed
1.39 - || !this->is_in_use(); // nmethod is installed, but not in 'alive' state
1.40 + bool is_installed = (method()->code() == this) // nmethod is in state 'in_use' and installed
1.41 + || !this->is_in_use(); // nmethod is installed, but not in 'in_use' state
1.42 if (is_installed) {
1.43 Thread *cur = Thread::current();
1.44 if (CompiledIC_lock->owner() == cur ||
