Mercurial > hg > graal-jvmci-8
changeset 10254:a1cc1d1e7ce5
Merge
author | coleenp |
---|---|
date | Tue, 07 May 2013 16:17:43 -0700 |
parents | 4674e409a9e6 (diff) 33bcd9ead1d5 (current diff) |
children | 28ae1d38d296 |
files | |
diffstat | 2 files changed, 18 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/code/nmethod.cpp Tue May 07 21:36:59 2013 +0200 +++ b/src/share/vm/code/nmethod.cpp Tue May 07 16:17:43 2013 -0700 @@ -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); }
--- a/src/share/vm/prims/jvmtiRedefineClasses.cpp Tue May 07 21:36:59 2013 +0200 +++ b/src/share/vm/prims/jvmtiRedefineClasses.cpp Tue May 07 16:17:43 2013 -0700 @@ -3366,6 +3366,10 @@ } #endif + // NULL out in scratch class to not delete twice. The class to be redefined + // always owns these bytes. + scratch_class->set_cached_class_file(NULL, 0); + // Replace inner_classes Array<u2>* old_inner_classes = the_class->inner_classes(); the_class->set_inner_classes(scratch_class->inner_classes());