archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 06:14:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

7012648: move JSR 292 to package java.lang.invoke and adjust names

Browse source 
Package and class renaming only; delete unused methods and classes

Reviewed-by: twisti
This commit is contained in:
John R Rose 2011-03-11 22:34:57 -08:00
parent 6146dffe45
commit f6344076f2
43 changed files with 640 additions and 582 deletions
Download patch file Download diff file Expand all files Collapse all files

7
hotspot/src/share/vm/interpreter/interpreterRuntime.cpp
View file

@ -369,7 +369,10 @@ IRT_ENTRY(void, InterpreterRuntime::throw_WrongMethodTypeException(JavaThread* t
}
// create exception
THROW_MSG(vmSymbols::java_dyn_WrongMethodTypeException(), message);
Symbol* java_lang_invoke_WrongMethodTypeException = vmSymbols::java_lang_invoke_WrongMethodTypeException();
if (AllowTransitionalJSR292)
java_lang_invoke_WrongMethodTypeException = SystemDictionaryHandles::WrongMethodTypeException_klass()->name();
THROW_MSG(java_lang_invoke_WrongMethodTypeException, message);
}
IRT_END
@ -794,7 +797,7 @@ IRT_ENTRY(void, InterpreterRuntime::resolve_invokedynamic(JavaThread* thread)) {
Handle info; // optional argument(s) in JVM_CONSTANT_InvokeDynamic
Handle bootm = SystemDictionary::find_bootstrap_method(caller_method, caller_bci,
main_index, info, CHECK);
if (!java_dyn_MethodHandle::is_instance(bootm())) {
if (!java_lang_invoke_MethodHandle::is_instance(bootm())) {
THROW_MSG(vmSymbols::java_lang_IllegalStateException(),
"no bootstrap method found for invokedynamic");
}