Mercurial > hg > graal-compiler
diff src/share/vm/classfile/classFileParser.cpp @ 6266:1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
6984705: JSR 292 method handle creation should not go through JNI
Summary: remove assembly code for JDK 7 chained method handles
Reviewed-by: jrose, twisti, kvn, mhaupt
Contributed-by: John Rose <john.r.rose@oracle.com>, Christian Thalinger <christian.thalinger@oracle.com>, Michael Haupt <michael.haupt@oracle.com>
| author | twisti |
|---|---|
| date | Tue, 24 Jul 2012 10:51:00 -0700 |
| parents | dd785aabe02b |
| children | da91efe96a93 |
line wrap: on
line diff
--- a/src/share/vm/classfile/classFileParser.cpp Mon Jul 23 13:04:59 2012 -0700 +++ b/src/share/vm/classfile/classFileParser.cpp Tue Jul 24 10:51:00 2012 -0700 @@ -1773,6 +1773,15 @@ case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_ForceInline_signature): if (_location != _in_method) break; // only allow for methods return _method_ForceInline; + case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_DontInline_signature): + if (_location != _in_method) break; // only allow for methods + return _method_DontInline; + case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_LambdaForm_Compiled_signature): + if (_location != _in_method) break; // only allow for methods + return _method_LambdaForm_Compiled; + case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_LambdaForm_Hidden_signature): + if (_location != _in_method) break; // only allow for methods + return _method_LambdaForm_Hidden; default: break; } return AnnotationCollector::_unknown; @@ -1785,6 +1794,12 @@ void ClassFileParser::MethodAnnotationCollector::apply_to(methodHandle m) { if (has_annotation(_method_ForceInline)) m->set_force_inline(true); + if (has_annotation(_method_DontInline)) + m->set_dont_inline(true); + if (has_annotation(_method_LambdaForm_Compiled) && m->intrinsic_id() == vmIntrinsics::_none) + m->set_intrinsic_id(vmIntrinsics::_compiledLambdaForm); + if (has_annotation(_method_LambdaForm_Hidden)) + m->set_hidden(true); } void ClassFileParser::ClassAnnotationCollector::apply_to(instanceKlassHandle k) { @@ -2336,12 +2351,6 @@ _has_vanilla_constructor = true; } - if (EnableInvokeDynamic && (m->is_method_handle_invoke() || - m->is_method_handle_adapter())) { - THROW_MSG_(vmSymbols::java_lang_VirtualMachineError(), - "Method handle invokers must be defined internally to the VM", nullHandle); - } - return m; }