1.1 --- a/src/share/vm/classfile/vmSymbols.hpp Fri Mar 11 22:33:47 2011 -0800
1.2 +++ b/src/share/vm/classfile/vmSymbols.hpp Fri Mar 11 22:34:57 2011 -0800
1.3 @@ -229,39 +229,60 @@
1.4 template(base_name, "base") \
1.5 \
1.6 /* Support for JSR 292 & invokedynamic (JDK 1.7 and above) */ \
1.7 - template(java_dyn_InvokeDynamic, "java/dyn/InvokeDynamic") \
1.8 - template(java_dyn_Linkage, "java/dyn/Linkage") \
1.9 - template(java_dyn_CallSite, "java/dyn/CallSite") \
1.10 - template(java_dyn_MethodHandle, "java/dyn/MethodHandle") \
1.11 - template(java_dyn_MethodType, "java/dyn/MethodType") \
1.12 - template(java_dyn_WrongMethodTypeException, "java/dyn/WrongMethodTypeException") \
1.13 - template(java_dyn_MethodType_signature, "Ljava/dyn/MethodType;") \
1.14 - template(java_dyn_MethodHandle_signature, "Ljava/dyn/MethodHandle;") \
1.15 + template(java_lang_invoke_InvokeDynamic, "java/lang/invoke/InvokeDynamic") \
1.16 + template(java_lang_invoke_Linkage, "java/lang/invoke/Linkage") \
1.17 + template(java_lang_invoke_CallSite, "java/lang/invoke/CallSite") \
1.18 + template(java_lang_invoke_MethodHandle, "java/lang/invoke/MethodHandle") \
1.19 + template(java_lang_invoke_MethodType, "java/lang/invoke/MethodType") \
1.20 + template(java_lang_invoke_WrongMethodTypeException, "java/lang/invoke/WrongMethodTypeException") \
1.21 + template(java_lang_invoke_MethodType_signature, "Ljava/lang/invoke/MethodType;") \
1.22 + template(java_lang_invoke_MethodHandle_signature, "Ljava/lang/invoke/MethodHandle;") \
1.23 /* internal classes known only to the JVM: */ \
1.24 - template(java_dyn_MethodTypeForm, "java/dyn/MethodTypeForm") \
1.25 - template(java_dyn_MethodTypeForm_signature, "Ljava/dyn/MethodTypeForm;") \
1.26 - template(java_dyn_MemberName, "java/dyn/MemberName") \
1.27 - template(java_dyn_MethodHandleImpl, "java/dyn/MethodHandleImpl") \
1.28 - template(java_dyn_MethodHandleNatives, "java/dyn/MethodHandleNatives") \
1.29 - template(java_dyn_AdapterMethodHandle, "java/dyn/AdapterMethodHandle") \
1.30 - template(java_dyn_BoundMethodHandle, "java/dyn/BoundMethodHandle") \
1.31 - template(java_dyn_DirectMethodHandle, "java/dyn/DirectMethodHandle") \
1.32 + template(java_lang_invoke_MethodTypeForm, "java/lang/invoke/MethodTypeForm") \
1.33 + template(java_lang_invoke_MethodTypeForm_signature, "Ljava/lang/invoke/MethodTypeForm;") \
1.34 + template(java_lang_invoke_MemberName, "java/lang/invoke/MemberName") \
1.35 + template(java_lang_invoke_MethodHandleNatives, "java/lang/invoke/MethodHandleNatives") \
1.36 + template(java_lang_invoke_AdapterMethodHandle, "java/lang/invoke/AdapterMethodHandle") \
1.37 + template(java_lang_invoke_BoundMethodHandle, "java/lang/invoke/BoundMethodHandle") \
1.38 + template(java_lang_invoke_DirectMethodHandle, "java/lang/invoke/DirectMethodHandle") \
1.39 + /* temporary transitional public names from 6839872: */ \
1.40 + template(java_dyn_InvokeDynamic, "java/dyn/InvokeDynamic") /* AllowTransitionalJSR292 ONLY */ \
1.41 + template(java_dyn_Linkage, "java/dyn/Linkage") /* AllowTransitionalJSR292 ONLY */ \
1.42 + template(java_dyn_CallSite, "java/dyn/CallSite") /* AllowTransitionalJSR292 ONLY */ \
1.43 + template(java_dyn_MethodHandle, "java/dyn/MethodHandle") /* AllowTransitionalJSR292 ONLY */ \
1.44 + template(java_dyn_MethodType, "java/dyn/MethodType") /* AllowTransitionalJSR292 ONLY */ \
1.45 + template(java_dyn_WrongMethodTypeException, "java/dyn/WrongMethodTypeException") /* AllowTransitionalJSR292 ONLY */ \
1.46 + template(java_dyn_MethodType_signature, "Ljava/dyn/MethodType;") /* AllowTransitionalJSR292 ONLY */ \
1.47 + template(java_dyn_MethodHandle_signature, "Ljava/dyn/MethodHandle;") /* AllowTransitionalJSR292 ONLY */ \
1.48 + /* temporary transitional internal names from 6839872: */ \
1.49 + template(java_dyn_MethodTypeForm, "java/dyn/MethodTypeForm") /* AllowTransitionalJSR292 ONLY */ \
1.50 + template(java_dyn_MethodTypeForm_signature, "Ljava/dyn/MethodTypeForm;") /* AllowTransitionalJSR292 ONLY */ \
1.51 + template(java_dyn_MemberName, "java/dyn/MemberName") /* AllowTransitionalJSR292 ONLY */ \
1.52 + template(java_dyn_MethodHandleNatives, "java/dyn/MethodHandleNatives") /* AllowTransitionalJSR292 ONLY */ \
1.53 + template(java_dyn_AdapterMethodHandle, "java/dyn/AdapterMethodHandle") /* AllowTransitionalJSR292 ONLY */ \
1.54 + template(java_dyn_BoundMethodHandle, "java/dyn/BoundMethodHandle") /* AllowTransitionalJSR292 ONLY */ \
1.55 + template(java_dyn_DirectMethodHandle, "java/dyn/DirectMethodHandle") /* AllowTransitionalJSR292 ONLY */ \
1.56 + /* temporary transitional internal names from EDR: */ \
1.57 template(sun_dyn_MemberName, "sun/dyn/MemberName") /* AllowTransitionalJSR292 ONLY */ \
1.58 template(sun_dyn_MethodHandleImpl, "sun/dyn/MethodHandleImpl") /* AllowTransitionalJSR292 ONLY */ \
1.59 template(sun_dyn_MethodHandleNatives, "sun/dyn/MethodHandleNatives") /* AllowTransitionalJSR292 ONLY */ \
1.60 template(sun_dyn_AdapterMethodHandle, "sun/dyn/AdapterMethodHandle") /* AllowTransitionalJSR292 ONLY */ \
1.61 template(sun_dyn_BoundMethodHandle, "sun/dyn/BoundMethodHandle") /* AllowTransitionalJSR292 ONLY */ \
1.62 template(sun_dyn_DirectMethodHandle, "sun/dyn/DirectMethodHandle") /* AllowTransitionalJSR292 ONLY */ \
1.63 - /* internal up-calls made only by the JVM, via class sun.dyn.MethodHandleNatives: */ \
1.64 + /* internal up-calls made only by the JVM, via class sun.invoke.MethodHandleNatives: */ \
1.65 template(findMethodHandleType_name, "findMethodHandleType") \
1.66 - template(findMethodHandleType_signature, "(Ljava/lang/Class;[Ljava/lang/Class;)Ljava/dyn/MethodType;") \
1.67 + template(findMethodHandleType_signature, "(Ljava/lang/Class;[Ljava/lang/Class;)Ljava/lang/invoke/MethodType;") \
1.68 + template(findMethodHandleType_TRANS_signature, "(Ljava/lang/Class;[Ljava/lang/Class;)Ljava/dyn/MethodType;") /* AllowTransitionalJSR292 ONLY */ \
1.69 template(notifyGenericMethodType_name, "notifyGenericMethodType") \
1.70 - template(notifyGenericMethodType_signature, "(Ljava/dyn/MethodType;)V") \
1.71 + template(notifyGenericMethodType_signature, "(Ljava/lang/invoke/MethodType;)V") \
1.72 + template(notifyGenericMethodType_TRANS_signature, "(Ljava/dyn/MethodType;)V") /* AllowTransitionalJSR292 ONLY */ \
1.73 template(linkMethodHandleConstant_name, "linkMethodHandleConstant") \
1.74 - template(linkMethodHandleConstant_signature, "(Ljava/lang/Class;ILjava/lang/Class;Ljava/lang/String;Ljava/lang/Object;)Ljava/dyn/MethodHandle;") \
1.75 + template(linkMethodHandleConstant_signature, "(Ljava/lang/Class;ILjava/lang/Class;Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/invoke/MethodHandle;") \
1.76 + template(linkMethodHandleConstant_TRANS_signature, "(Ljava/lang/Class;ILjava/lang/Class;Ljava/lang/String;Ljava/lang/Object;)Ljava/dyn/MethodHandle;") /* AllowTransitionalJSR292 ONLY */ \
1.77 template(makeDynamicCallSite_name, "makeDynamicCallSite") \
1.78 - template(makeDynamicCallSite_signature, "(Ljava/dyn/MethodHandle;Ljava/lang/String;Ljava/dyn/MethodType;Ljava/lang/Object;Ljava/dyn/MemberName;I)Ljava/dyn/CallSite;") \
1.79 + template(makeDynamicCallSite_signature, "(Ljava/lang/invoke/MethodHandle;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/Object;Ljava/lang/invoke/MemberName;I)Ljava/lang/invoke/CallSite;") \
1.80 template(makeDynamicCallSite_TRANS_signature, "(Ljava/dyn/MethodHandle;Ljava/lang/String;Ljava/dyn/MethodType;Ljava/lang/Object;Lsun/dyn/MemberName;I)Ljava/dyn/CallSite;") /* AllowTransitionalJSR292 ONLY */ \
1.81 + template(makeDynamicCallSite_TRANS2_signature, "(Ljava/dyn/MethodHandle;Ljava/lang/String;Ljava/dyn/MethodType;Ljava/lang/Object;Ljava/dyn/MemberName;I)Ljava/dyn/CallSite;") /* AllowTransitionalJSR292 ONLY */ \
1.82 NOT_LP64( do_alias(machine_word_signature, int_signature) ) \
1.83 LP64_ONLY( do_alias(machine_word_signature, long_signature) ) \
1.84 \
1.85 @@ -888,14 +909,15 @@
1.86 \
1.87 do_intrinsic(_invoke, java_lang_reflect_Method, invoke_name, object_object_array_object_signature, F_R) \
1.88 /* (symbols invoke_name and invoke_signature defined above) */ \
1.89 - do_intrinsic(_checkSpreadArgument, java_dyn_MethodHandleNatives, checkSpreadArgument_name, checkSpreadArgument_signature, F_S) \
1.90 - do_intrinsic(_checkSpreadArgument_TRANS, sun_dyn_MethodHandleImpl, checkSpreadArgument_name, checkSpreadArgument_signature, F_S) /* AllowTransitionalJSR292 ONLY */ \
1.91 + do_intrinsic(_checkSpreadArgument, java_lang_invoke_MethodHandleNatives, checkSpreadArgument_name, checkSpreadArgument_signature, F_S) \
1.92 + do_intrinsic(_checkSpreadArgument_TRANS,sun_dyn_MethodHandleImpl, checkSpreadArgument_name, checkSpreadArgument_signature, F_S) /* AllowTransitionalJSR292 ONLY */ \
1.93 + do_intrinsic(_checkSpreadArgument_TRANS2,java_dyn_MethodHandleNatives, checkSpreadArgument_name, checkSpreadArgument_signature, F_S) /* AllowTransitionalJSR292 ONLY */ \
1.94 do_name( checkSpreadArgument_name, "checkSpreadArgument") \
1.95 do_name( checkSpreadArgument_signature, "(Ljava/lang/Object;I)V") \
1.96 - do_intrinsic(_invokeExact, java_dyn_MethodHandle, invokeExact_name, object_array_object_signature, F_RN) \
1.97 - do_intrinsic(_invokeGeneric, java_dyn_MethodHandle, invokeGeneric_name, object_array_object_signature, F_RN) \
1.98 - do_intrinsic(_invokeVarargs, java_dyn_MethodHandle, invokeVarargs_name, object_array_object_signature, F_R) \
1.99 - do_intrinsic(_invokeDynamic, java_dyn_InvokeDynamic, star_name, object_array_object_signature, F_SN) \
1.100 + do_intrinsic(_invokeExact, java_lang_invoke_MethodHandle, invokeExact_name, object_array_object_signature, F_RN) \
1.101 + do_intrinsic(_invokeGeneric, java_lang_invoke_MethodHandle, invokeGeneric_name, object_array_object_signature, F_RN) \
1.102 + do_intrinsic(_invokeVarargs, java_lang_invoke_MethodHandle, invokeVarargs_name, object_array_object_signature, F_R) \
1.103 + do_intrinsic(_invokeDynamic, java_lang_invoke_InvokeDynamic, star_name, object_array_object_signature, F_SN) \
1.104 \
1.105 /* unboxing methods: */ \
1.106 do_intrinsic(_booleanValue, java_lang_Boolean, booleanValue_name, void_boolean_signature, F_R) \
