Mercurial > hg > truffle

comparison src/share/vm/classfile/vmSymbols.hpp @ 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 ed69575596ac 6a615eae2f34 e1162778c1c8
comparison
equal deleted inserted replaced
2356:72dee110246f 2357:8033953d67ff
227 template(constantPoolOop_name, "constantPoolOop") \ 227 template(constantPoolOop_name, "constantPoolOop") \
228 template(sun_reflect_UnsafeStaticFieldAccessorImpl, "sun/reflect/UnsafeStaticFieldAccessorImpl")\ 228 template(sun_reflect_UnsafeStaticFieldAccessorImpl, "sun/reflect/UnsafeStaticFieldAccessorImpl")\
229 template(base_name, "base") \ 229 template(base_name, "base") \
230 \ 230 \
231 /* Support for JSR 292 & invokedynamic (JDK 1.7 and above) */ \ 231 /* Support for JSR 292 & invokedynamic (JDK 1.7 and above) */ \
232 template(java_dyn_InvokeDynamic, "java/dyn/InvokeDynamic") \ 232 template(java_lang_invoke_InvokeDynamic, "java/lang/invoke/InvokeDynamic") \
233 template(java_dyn_Linkage, "java/dyn/Linkage") \ 233 template(java_lang_invoke_Linkage, "java/lang/invoke/Linkage") \
234 template(java_dyn_CallSite, "java/dyn/CallSite") \ 234 template(java_lang_invoke_CallSite, "java/lang/invoke/CallSite") \
235 template(java_dyn_MethodHandle, "java/dyn/MethodHandle") \ 235 template(java_lang_invoke_MethodHandle, "java/lang/invoke/MethodHandle") \
236 template(java_dyn_MethodType, "java/dyn/MethodType") \ 236 template(java_lang_invoke_MethodType, "java/lang/invoke/MethodType") \
237 template(java_dyn_WrongMethodTypeException, "java/dyn/WrongMethodTypeException") \ 237 template(java_lang_invoke_WrongMethodTypeException, "java/lang/invoke/WrongMethodTypeException") \
238 template(java_dyn_MethodType_signature, "Ljava/dyn/MethodType;") \ 238 template(java_lang_invoke_MethodType_signature, "Ljava/lang/invoke/MethodType;") \
239 template(java_dyn_MethodHandle_signature, "Ljava/dyn/MethodHandle;") \ 239 template(java_lang_invoke_MethodHandle_signature, "Ljava/lang/invoke/MethodHandle;") \
240 /* internal classes known only to the JVM: */ \ 240 /* internal classes known only to the JVM: */ \
241 template(java_dyn_MethodTypeForm, "java/dyn/MethodTypeForm") \ 241 template(java_lang_invoke_MethodTypeForm, "java/lang/invoke/MethodTypeForm") \
242 template(java_dyn_MethodTypeForm_signature, "Ljava/dyn/MethodTypeForm;") \ 242 template(java_lang_invoke_MethodTypeForm_signature, "Ljava/lang/invoke/MethodTypeForm;") \
243 template(java_dyn_MemberName, "java/dyn/MemberName") \ 243 template(java_lang_invoke_MemberName, "java/lang/invoke/MemberName") \
244 template(java_dyn_MethodHandleImpl, "java/dyn/MethodHandleImpl") \ 244 template(java_lang_invoke_MethodHandleNatives, "java/lang/invoke/MethodHandleNatives") \
245 template(java_dyn_MethodHandleNatives, "java/dyn/MethodHandleNatives") \ 245 template(java_lang_invoke_AdapterMethodHandle, "java/lang/invoke/AdapterMethodHandle") \
246 template(java_dyn_AdapterMethodHandle, "java/dyn/AdapterMethodHandle") \ 246 template(java_lang_invoke_BoundMethodHandle, "java/lang/invoke/BoundMethodHandle") \
247 template(java_dyn_BoundMethodHandle, "java/dyn/BoundMethodHandle") \ 247 template(java_lang_invoke_DirectMethodHandle, "java/lang/invoke/DirectMethodHandle") \
248 template(java_dyn_DirectMethodHandle, "java/dyn/DirectMethodHandle") \ 248 /* temporary transitional public names from 6839872: */ \
249 template(java_dyn_InvokeDynamic, "java/dyn/InvokeDynamic") /* AllowTransitionalJSR292 ONLY */ \
250 template(java_dyn_Linkage, "java/dyn/Linkage") /* AllowTransitionalJSR292 ONLY */ \
251 template(java_dyn_CallSite, "java/dyn/CallSite") /* AllowTransitionalJSR292 ONLY */ \
252 template(java_dyn_MethodHandle, "java/dyn/MethodHandle") /* AllowTransitionalJSR292 ONLY */ \
253 template(java_dyn_MethodType, "java/dyn/MethodType") /* AllowTransitionalJSR292 ONLY */ \
254 template(java_dyn_WrongMethodTypeException, "java/dyn/WrongMethodTypeException") /* AllowTransitionalJSR292 ONLY */ \
255 template(java_dyn_MethodType_signature, "Ljava/dyn/MethodType;") /* AllowTransitionalJSR292 ONLY */ \
256 template(java_dyn_MethodHandle_signature, "Ljava/dyn/MethodHandle;") /* AllowTransitionalJSR292 ONLY */ \
257 /* temporary transitional internal names from 6839872: */ \
258 template(java_dyn_MethodTypeForm, "java/dyn/MethodTypeForm") /* AllowTransitionalJSR292 ONLY */ \
259 template(java_dyn_MethodTypeForm_signature, "Ljava/dyn/MethodTypeForm;") /* AllowTransitionalJSR292 ONLY */ \
260 template(java_dyn_MemberName, "java/dyn/MemberName") /* AllowTransitionalJSR292 ONLY */ \
261 template(java_dyn_MethodHandleNatives, "java/dyn/MethodHandleNatives") /* AllowTransitionalJSR292 ONLY */ \
262 template(java_dyn_AdapterMethodHandle, "java/dyn/AdapterMethodHandle") /* AllowTransitionalJSR292 ONLY */ \
263 template(java_dyn_BoundMethodHandle, "java/dyn/BoundMethodHandle") /* AllowTransitionalJSR292 ONLY */ \
264 template(java_dyn_DirectMethodHandle, "java/dyn/DirectMethodHandle") /* AllowTransitionalJSR292 ONLY */ \
265 /* temporary transitional internal names from EDR: */ \
249 template(sun_dyn_MemberName, "sun/dyn/MemberName") /* AllowTransitionalJSR292 ONLY */ \ 266 template(sun_dyn_MemberName, "sun/dyn/MemberName") /* AllowTransitionalJSR292 ONLY */ \
250 template(sun_dyn_MethodHandleImpl, "sun/dyn/MethodHandleImpl") /* AllowTransitionalJSR292 ONLY */ \ 267 template(sun_dyn_MethodHandleImpl, "sun/dyn/MethodHandleImpl") /* AllowTransitionalJSR292 ONLY */ \
251 template(sun_dyn_MethodHandleNatives, "sun/dyn/MethodHandleNatives") /* AllowTransitionalJSR292 ONLY */ \ 268 template(sun_dyn_MethodHandleNatives, "sun/dyn/MethodHandleNatives") /* AllowTransitionalJSR292 ONLY */ \
252 template(sun_dyn_AdapterMethodHandle, "sun/dyn/AdapterMethodHandle") /* AllowTransitionalJSR292 ONLY */ \ 269 template(sun_dyn_AdapterMethodHandle, "sun/dyn/AdapterMethodHandle") /* AllowTransitionalJSR292 ONLY */ \
253 template(sun_dyn_BoundMethodHandle, "sun/dyn/BoundMethodHandle") /* AllowTransitionalJSR292 ONLY */ \ 270 template(sun_dyn_BoundMethodHandle, "sun/dyn/BoundMethodHandle") /* AllowTransitionalJSR292 ONLY */ \
254 template(sun_dyn_DirectMethodHandle, "sun/dyn/DirectMethodHandle") /* AllowTransitionalJSR292 ONLY */ \ 271 template(sun_dyn_DirectMethodHandle, "sun/dyn/DirectMethodHandle") /* AllowTransitionalJSR292 ONLY */ \
255 /* internal up-calls made only by the JVM, via class sun.dyn.MethodHandleNatives: */ \ 272 /* internal up-calls made only by the JVM, via class sun.invoke.MethodHandleNatives: */ \
256 template(findMethodHandleType_name, "findMethodHandleType") \ 273 template(findMethodHandleType_name, "findMethodHandleType") \
257 template(findMethodHandleType_signature, "(Ljava/lang/Class;[Ljava/lang/Class;)Ljava/dyn/MethodType;") \ 274 template(findMethodHandleType_signature, "(Ljava/lang/Class;[Ljava/lang/Class;)Ljava/lang/invoke/MethodType;") \
275 template(findMethodHandleType_TRANS_signature, "(Ljava/lang/Class;[Ljava/lang/Class;)Ljava/dyn/MethodType;") /* AllowTransitionalJSR292 ONLY */ \
258 template(notifyGenericMethodType_name, "notifyGenericMethodType") \ 276 template(notifyGenericMethodType_name, "notifyGenericMethodType") \
259 template(notifyGenericMethodType_signature, "(Ljava/dyn/MethodType;)V") \ 277 template(notifyGenericMethodType_signature, "(Ljava/lang/invoke/MethodType;)V") \
278 template(notifyGenericMethodType_TRANS_signature, "(Ljava/dyn/MethodType;)V") /* AllowTransitionalJSR292 ONLY */ \
260 template(linkMethodHandleConstant_name, "linkMethodHandleConstant") \ 279 template(linkMethodHandleConstant_name, "linkMethodHandleConstant") \
261 template(linkMethodHandleConstant_signature, "(Ljava/lang/Class;ILjava/lang/Class;Ljava/lang/String;Ljava/lang/Object;)Ljava/dyn/MethodHandle;") \ 280 template(linkMethodHandleConstant_signature, "(Ljava/lang/Class;ILjava/lang/Class;Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/invoke/MethodHandle;") \
281 template(linkMethodHandleConstant_TRANS_signature, "(Ljava/lang/Class;ILjava/lang/Class;Ljava/lang/String;Ljava/lang/Object;)Ljava/dyn/MethodHandle;") /* AllowTransitionalJSR292 ONLY */ \
262 template(makeDynamicCallSite_name, "makeDynamicCallSite") \ 282 template(makeDynamicCallSite_name, "makeDynamicCallSite") \
263 template(makeDynamicCallSite_signature, "(Ljava/dyn/MethodHandle;Ljava/lang/String;Ljava/dyn/MethodType;Ljava/lang/Object;Ljava/dyn/MemberName;I)Ljava/dyn/CallSite;") \ 283 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;") \
264 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 */ \ 284 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 */ \
285 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 */ \
265 NOT_LP64( do_alias(machine_word_signature, int_signature) ) \ 286 NOT_LP64( do_alias(machine_word_signature, int_signature) ) \
266 LP64_ONLY( do_alias(machine_word_signature, long_signature) ) \ 287 LP64_ONLY( do_alias(machine_word_signature, long_signature) ) \
267 \ 288 \
268 /* common method and field names */ \ 289 /* common method and field names */ \
269 template(object_initializer_name, "<init>") \ 290 template(object_initializer_name, "<init>") \
886 do_intrinsic(_Object_init, java_lang_Object, object_initializer_name, void_method_signature, F_R) \ 907 do_intrinsic(_Object_init, java_lang_Object, object_initializer_name, void_method_signature, F_R) \
887 /* (symbol object_initializer_name defined above) */ \ 908 /* (symbol object_initializer_name defined above) */ \
888 \ 909 \
889 do_intrinsic(_invoke, java_lang_reflect_Method, invoke_name, object_object_array_object_signature, F_R) \ 910 do_intrinsic(_invoke, java_lang_reflect_Method, invoke_name, object_object_array_object_signature, F_R) \
890 /* (symbols invoke_name and invoke_signature defined above) */ \ 911 /* (symbols invoke_name and invoke_signature defined above) */ \
891 do_intrinsic(_checkSpreadArgument, java_dyn_MethodHandleNatives, checkSpreadArgument_name, checkSpreadArgument_signature, F_S) \ 912 do_intrinsic(_checkSpreadArgument, java_lang_invoke_MethodHandleNatives, checkSpreadArgument_name, checkSpreadArgument_signature, F_S) \
892 do_intrinsic(_checkSpreadArgument_TRANS, sun_dyn_MethodHandleImpl, checkSpreadArgument_name, checkSpreadArgument_signature, F_S) /* AllowTransitionalJSR292 ONLY */ \ 913 do_intrinsic(_checkSpreadArgument_TRANS,sun_dyn_MethodHandleImpl, checkSpreadArgument_name, checkSpreadArgument_signature, F_S) /* AllowTransitionalJSR292 ONLY */ \
914 do_intrinsic(_checkSpreadArgument_TRANS2,java_dyn_MethodHandleNatives, checkSpreadArgument_name, checkSpreadArgument_signature, F_S) /* AllowTransitionalJSR292 ONLY */ \
893 do_name( checkSpreadArgument_name, "checkSpreadArgument") \ 915 do_name( checkSpreadArgument_name, "checkSpreadArgument") \
894 do_name( checkSpreadArgument_signature, "(Ljava/lang/Object;I)V") \ 916 do_name( checkSpreadArgument_signature, "(Ljava/lang/Object;I)V") \
895 do_intrinsic(_invokeExact, java_dyn_MethodHandle, invokeExact_name, object_array_object_signature, F_RN) \ 917 do_intrinsic(_invokeExact, java_lang_invoke_MethodHandle, invokeExact_name, object_array_object_signature, F_RN) \
896 do_intrinsic(_invokeGeneric, java_dyn_MethodHandle, invokeGeneric_name, object_array_object_signature, F_RN) \ 918 do_intrinsic(_invokeGeneric, java_lang_invoke_MethodHandle, invokeGeneric_name, object_array_object_signature, F_RN) \
897 do_intrinsic(_invokeVarargs, java_dyn_MethodHandle, invokeVarargs_name, object_array_object_signature, F_R) \ 919 do_intrinsic(_invokeVarargs, java_lang_invoke_MethodHandle, invokeVarargs_name, object_array_object_signature, F_R) \
898 do_intrinsic(_invokeDynamic, java_dyn_InvokeDynamic, star_name, object_array_object_signature, F_SN) \ 920 do_intrinsic(_invokeDynamic, java_lang_invoke_InvokeDynamic, star_name, object_array_object_signature, F_SN) \
899 \ 921 \
900 /* unboxing methods: */ \ 922 /* unboxing methods: */ \
901 do_intrinsic(_booleanValue, java_lang_Boolean, booleanValue_name, void_boolean_signature, F_R) \ 923 do_intrinsic(_booleanValue, java_lang_Boolean, booleanValue_name, void_boolean_signature, F_R) \
902 do_name( booleanValue_name, "booleanValue") \ 924 do_name( booleanValue_name, "booleanValue") \
903 do_intrinsic(_byteValue, java_lang_Byte, byteValue_name, void_byte_signature, F_R) \ 925 do_intrinsic(_byteValue, java_lang_Byte, byteValue_name, void_byte_signature, F_R) \