comparison src/share/vm/interpreter/linkResolver.cpp @ 2460:ed69575596ac

6981791: remove experimental code for JSR 292 Reviewed-by: twisti
author jrose
date Thu, 07 Apr 2011 17:02:30 -0700
parents 38fea01eb669
children acf5e660c71a
comparison
equal deleted inserted replaced
2459:55973726c600 2460:ed69575596ac
219 methodOopDesc::is_method_handle_invoke_name(name)) { 219 methodOopDesc::is_method_handle_invoke_name(name)) {
220 if (!THREAD->is_Compiler_thread() && !MethodHandles::enabled()) { 220 if (!THREAD->is_Compiler_thread() && !MethodHandles::enabled()) {
221 // Make sure the Java part of the runtime has been booted up. 221 // Make sure the Java part of the runtime has been booted up.
222 klassOop natives = SystemDictionary::MethodHandleNatives_klass(); 222 klassOop natives = SystemDictionary::MethodHandleNatives_klass();
223 if (natives == NULL || instanceKlass::cast(natives)->is_not_initialized()) { 223 if (natives == NULL || instanceKlass::cast(natives)->is_not_initialized()) {
224 Symbol* natives_name = vmSymbols::java_lang_invoke_MethodHandleNatives(); 224 SystemDictionary::resolve_or_fail(vmSymbols::java_lang_invoke_MethodHandleNatives(),
225 if (natives != NULL && AllowTransitionalJSR292) natives_name = Klass::cast(natives)->name();
226 SystemDictionary::resolve_or_fail(natives_name,
227 Handle(), 225 Handle(),
228 Handle(), 226 Handle(),
229 true, 227 true,
230 CHECK); 228 CHECK);
231 } 229 }