1.1 --- a/src/share/vm/code/nmethod.cpp Thu Oct 08 09:37:51 2015 +0200
1.2 +++ b/src/share/vm/code/nmethod.cpp Thu Oct 08 09:38:24 2015 +0200
1.3 @@ -1191,7 +1191,7 @@
1.4 if( cb != NULL && cb->is_nmethod() ) {
1.5 nmethod* nm = (nmethod*)cb;
1.6 // Clean inline caches pointing to zombie, non-entrant and unloaded methods
1.7 - if (!nm->is_in_use() || (nm->method()->code() != nm)) ic->set_to_clean();
1.8 + if (!nm->is_in_use() || (nm->method()->code() != nm)) ic->set_to_clean(is_alive());
1.9 }
1.10 break;
1.11 }
1.12 @@ -1291,7 +1291,7 @@
1.13 // Tell if a non-entrant method can be converted to a zombie (i.e.,
1.14 // there are no activations on the stack, not in use by the VM,
1.15 // and not in use by the ServiceThread)
1.16 -bool nmethod::can_not_entrant_be_converted() {
1.17 +bool nmethod::can_convert_to_zombie() {
1.18 assert(is_not_entrant(), "must be a non-entrant method");
1.19
1.20 // Since the nmethod sweeper only does partial sweep the sweeper's traversal
