1.1 --- a/src/share/vm/code/nmethod.cpp Mon Nov 11 11:53:33 2013 -0800 1.2 +++ b/src/share/vm/code/nmethod.cpp Tue Nov 12 09:32:50 2013 +0100 1.3 @@ -1259,7 +1259,7 @@ 1.4 1.5 set_osr_link(NULL); 1.6 //set_scavenge_root_link(NULL); // done by prune_scavenge_root_nmethods 1.7 - NMethodSweeper::notify(); 1.8 + NMethodSweeper::report_state_change(this); 1.9 } 1.10 1.11 void nmethod::invalidate_osr_method() { 1.12 @@ -1293,7 +1293,9 @@ 1.13 } 1.14 } 1.15 1.16 -// Common functionality for both make_not_entrant and make_zombie 1.17 +/** 1.18 + * Common functionality for both make_not_entrant and make_zombie 1.19 + */ 1.20 bool nmethod::make_not_entrant_or_zombie(unsigned int state) { 1.21 assert(state == zombie || state == not_entrant, "must be zombie or not_entrant"); 1.22 assert(!is_zombie(), "should not already be a zombie"); 1.23 @@ -1417,9 +1419,7 @@ 1.24 tty->print_cr("nmethod <" INTPTR_FORMAT "> code made %s", this, (state == not_entrant) ? "not entrant" : "zombie"); 1.25 } 1.26 1.27 - // Make sweeper aware that there is a zombie method that needs to be removed 1.28 - NMethodSweeper::notify(); 1.29 - 1.30 + NMethodSweeper::report_state_change(this); 1.31 return true; 1.32 } 1.33