Mercurial > hg > truffle
diff src/share/vm/classfile/systemDictionary.cpp @ 1135:e66fd840cb6b
6893081: method handle & invokedynamic code needs additional cleanup (post 6815692, 6858164)
Summary: During the work for 6829187 we have fixed a number of basic bugs which are logically grouped with 6815692 and 6858164 but which must be reviewed and pushed separately.
Reviewed-by: kvn, never
| author | twisti |
|---|---|
| date | Mon, 04 Jan 2010 18:38:08 +0100 |
| parents | 1920bd911283 |
| children | 4ce7240d622c |
line wrap: on
line diff
--- a/src/share/vm/classfile/systemDictionary.cpp Mon Jan 04 07:04:46 2010 -0800 +++ b/src/share/vm/classfile/systemDictionary.cpp Mon Jan 04 18:38:08 2010 +0100 @@ -1984,7 +1984,7 @@ scan = WKID(meth_group_end+1); } WKID indy_group_start = WK_KLASS_ENUM_NAME(Linkage_klass); - WKID indy_group_end = WK_KLASS_ENUM_NAME(Dynamic_klass); + WKID indy_group_end = WK_KLASS_ENUM_NAME(InvokeDynamic_klass); initialize_wk_klasses_until(indy_group_start, scan, CHECK); if (EnableInvokeDynamic) { initialize_wk_klasses_through(indy_group_end, scan, CHECK); @@ -2340,6 +2340,8 @@ SymbolPropertyEntry* spe = invoke_method_table()->find_entry(index, hash, signature); if (spe == NULL || spe->property_oop() == NULL) { // Must create lots of stuff here, but outside of the SystemDictionary lock. + if (THREAD->is_Compiler_thread()) + return NULL; // do not attempt from within compiler Handle mt = compute_method_handle_type(signature(), class_loader, protection_domain, CHECK_NULL);