*** old/src/share/vm/classfile/systemDictionary.cpp	Tue Oct 20 22:06:53 2009
--- new/src/share/vm/classfile/systemDictionary.cpp	Tue Oct 20 22:06:52 2009

*** 1968,1978 ****
--- 1968,1978 ----
    if (_well_known_klasses[meth_group_start] == NULL) {
      // Skip the rest of the method handle classes, if MethodHandle is not loaded.
      scan = WKID(meth_group_end+1);
    }
    WKID indy_group_start = WK_KLASS_ENUM_NAME(Linkage_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);
    }
    if (_well_known_klasses[indy_group_start] == NULL) {

*** 2324,2333 ****
--- 2324,2335 ----
    unsigned int hash  = invoke_method_table()->compute_hash(signature);
    int          index = invoke_method_table()->hash_to_index(hash);
    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);
      KlassHandle  mh_klass = SystemDictionaryHandles::MethodHandle_klass();
      methodHandle m = methodOopDesc::make_invoke_method(mh_klass, signature,