Mercurial > hg > truffle
diff src/share/vm/code/nmethod.cpp @ 10253:4674e409a9e6
8014024: NPG: keep compiled ic methods from being deallocated in redefine classes
Summary: Walk the compiledIC relocation records to keep Method* from being deallocated.
Reviewed-by: dlong, kvn
author | coleenp |
---|---|
date | Tue, 07 May 2013 18:51:31 -0400 |
parents | a7fb14888912 |
children | 28e5aed7f3a6 |
line wrap: on
line diff
--- a/src/share/vm/code/nmethod.cpp Tue May 07 09:46:15 2013 -0400 +++ b/src/share/vm/code/nmethod.cpp Tue May 07 18:51:31 2013 -0400 @@ -1794,6 +1794,19 @@ Metadata* md = r->metadata_value(); f(md); } + } else if (iter.type() == relocInfo::virtual_call_type) { + // Check compiledIC holders associated with this nmethod + CompiledIC *ic = CompiledIC_at(iter.reloc()); + if (ic->is_icholder_call()) { + CompiledICHolder* cichk = ic->cached_icholder(); + f(cichk->holder_method()); + f(cichk->holder_klass()); + } else { + Metadata* ic_oop = ic->cached_metadata(); + if (ic_oop != NULL) { + f(ic_oop); + } + } } } } @@ -1804,6 +1817,7 @@ Metadata* md = *p; f(md); } + // Call function Method*, not embedded in these other places. if (_method != NULL) f(_method); }