Mercurial > hg > graal-jvmci-8

comparison src/share/vm/interpreter/linkResolver.cpp @ 2357:8033953d67ff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7012648: move JSR 292 to package java.lang.invoke and adjust names Summary: package and class renaming only; delete unused methods and classes Reviewed-by: twisti
author jrose
date Fri, 11 Mar 2011 22:34:57 -0800
parents 72dee110246f
children d2134498fd3f
comparison
equal deleted inserted replaced
2356:72dee110246f 2357:8033953d67ff
219 methodOopDesc::is_method_handle_invoke_name(name)) { 219 methodOopDesc::is_method_handle_invoke_name(name)) {
220 if (!MethodHandles::enabled()) { 220 if (!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_dyn_MethodHandleNatives(); 224 Symbol* natives_name = vmSymbols::java_lang_invoke_MethodHandleNatives();
225 if (natives != NULL && AllowTransitionalJSR292) natives_name = Klass::cast(natives)->name(); 225 if (natives != NULL && AllowTransitionalJSR292) natives_name = Klass::cast(natives)->name();
226 SystemDictionary::resolve_or_fail(natives_name, 226 SystemDictionary::resolve_or_fail(natives_name,
227 Handle(), 227 Handle(),
228 Handle(), 228 Handle(),
229 true, 229 true,
298 298
299 resolve_method(resolved_method, resolved_klass, method_name, method_signature, current_klass, true, CHECK); 299 resolve_method(resolved_method, resolved_klass, method_name, method_signature, current_klass, true, CHECK);
300 } 300 }
301 301
302 void LinkResolver::resolve_dynamic_method(methodHandle& resolved_method, KlassHandle& resolved_klass, constantPoolHandle pool, int index, TRAPS) { 302 void LinkResolver::resolve_dynamic_method(methodHandle& resolved_method, KlassHandle& resolved_klass, constantPoolHandle pool, int index, TRAPS) {
303 // The class is java.dyn.MethodHandle 303 // The class is java.lang.invoke.MethodHandle
304 resolved_klass = SystemDictionaryHandles::MethodHandle_klass(); 304 resolved_klass = SystemDictionaryHandles::MethodHandle_klass();
305 305
306 Symbol* method_name = vmSymbols::invokeExact_name(); 306 Symbol* method_name = vmSymbols::invokeExact_name();
307 307
308 Symbol* method_signature = pool->signature_ref_at(index); 308 Symbol* method_signature = pool->signature_ref_at(index);