1.1 --- a/src/share/vm/code/nmethod.cpp Fri May 02 16:44:54 2014 -0700 1.2 +++ b/src/share/vm/code/nmethod.cpp Mon Apr 28 12:39:12 2014 +0200 1.3 @@ -771,7 +771,11 @@ 1.4 _hotness_counter = NMethodSweeper::hotness_counter_reset_val(); 1.5 1.6 code_buffer->copy_values_to(this); 1.7 - debug_only(verify_scavenge_root_oops()); 1.8 + if (ScavengeRootsInCode && detect_scavenge_root_oops()) { 1.9 + CodeCache::add_scavenge_root_nmethod(this); 1.10 + Universe::heap()->register_nmethod(this); 1.11 + } 1.12 + DEBUG_ONLY(verify_scavenge_root_oops();) 1.13 CodeCache::commit(this); 1.14 } 1.15