Mercurial > hg > truffle
comparison src/share/vm/classfile/vmSymbols.hpp @ 2460:ed69575596ac
6981791: remove experimental code for JSR 292
Reviewed-by: twisti
author | jrose |
---|---|
date | Thu, 07 Apr 2011 17:02:30 -0700 |
parents | 8033953d67ff |
children | 3449f5e02cc4 5d046bf49ce7 |
comparison
equal
deleted
inserted
replaced
2459:55973726c600 | 2460:ed69575596ac |
---|---|
243 template(java_lang_invoke_MemberName, "java/lang/invoke/MemberName") \ | 243 template(java_lang_invoke_MemberName, "java/lang/invoke/MemberName") \ |
244 template(java_lang_invoke_MethodHandleNatives, "java/lang/invoke/MethodHandleNatives") \ | 244 template(java_lang_invoke_MethodHandleNatives, "java/lang/invoke/MethodHandleNatives") \ |
245 template(java_lang_invoke_AdapterMethodHandle, "java/lang/invoke/AdapterMethodHandle") \ | 245 template(java_lang_invoke_AdapterMethodHandle, "java/lang/invoke/AdapterMethodHandle") \ |
246 template(java_lang_invoke_BoundMethodHandle, "java/lang/invoke/BoundMethodHandle") \ | 246 template(java_lang_invoke_BoundMethodHandle, "java/lang/invoke/BoundMethodHandle") \ |
247 template(java_lang_invoke_DirectMethodHandle, "java/lang/invoke/DirectMethodHandle") \ | 247 template(java_lang_invoke_DirectMethodHandle, "java/lang/invoke/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: */ \ | |
266 template(sun_dyn_MemberName, "sun/dyn/MemberName") /* AllowTransitionalJSR292 ONLY */ \ | |
267 template(sun_dyn_MethodHandleImpl, "sun/dyn/MethodHandleImpl") /* AllowTransitionalJSR292 ONLY */ \ | |
268 template(sun_dyn_MethodHandleNatives, "sun/dyn/MethodHandleNatives") /* AllowTransitionalJSR292 ONLY */ \ | |
269 template(sun_dyn_AdapterMethodHandle, "sun/dyn/AdapterMethodHandle") /* AllowTransitionalJSR292 ONLY */ \ | |
270 template(sun_dyn_BoundMethodHandle, "sun/dyn/BoundMethodHandle") /* AllowTransitionalJSR292 ONLY */ \ | |
271 template(sun_dyn_DirectMethodHandle, "sun/dyn/DirectMethodHandle") /* AllowTransitionalJSR292 ONLY */ \ | |
272 /* internal up-calls made only by the JVM, via class sun.invoke.MethodHandleNatives: */ \ | 248 /* internal up-calls made only by the JVM, via class sun.invoke.MethodHandleNatives: */ \ |
273 template(findMethodHandleType_name, "findMethodHandleType") \ | 249 template(findMethodHandleType_name, "findMethodHandleType") \ |
274 template(findMethodHandleType_signature, "(Ljava/lang/Class;[Ljava/lang/Class;)Ljava/lang/invoke/MethodType;") \ | 250 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 */ \ | |
276 template(notifyGenericMethodType_name, "notifyGenericMethodType") \ | 251 template(notifyGenericMethodType_name, "notifyGenericMethodType") \ |
277 template(notifyGenericMethodType_signature, "(Ljava/lang/invoke/MethodType;)V") \ | 252 template(notifyGenericMethodType_signature, "(Ljava/lang/invoke/MethodType;)V") \ |
278 template(notifyGenericMethodType_TRANS_signature, "(Ljava/dyn/MethodType;)V") /* AllowTransitionalJSR292 ONLY */ \ | |
279 template(linkMethodHandleConstant_name, "linkMethodHandleConstant") \ | 253 template(linkMethodHandleConstant_name, "linkMethodHandleConstant") \ |
280 template(linkMethodHandleConstant_signature, "(Ljava/lang/Class;ILjava/lang/Class;Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/invoke/MethodHandle;") \ | 254 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 */ \ | |
282 template(makeDynamicCallSite_name, "makeDynamicCallSite") \ | 255 template(makeDynamicCallSite_name, "makeDynamicCallSite") \ |
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;") \ | 256 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;") \ |
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 */ \ | |
286 NOT_LP64( do_alias(machine_word_signature, int_signature) ) \ | 257 NOT_LP64( do_alias(machine_word_signature, int_signature) ) \ |
287 LP64_ONLY( do_alias(machine_word_signature, long_signature) ) \ | 258 LP64_ONLY( do_alias(machine_word_signature, long_signature) ) \ |
288 \ | 259 \ |
289 /* common method and field names */ \ | 260 /* common method and field names */ \ |
290 template(object_initializer_name, "<init>") \ | 261 template(object_initializer_name, "<init>") \ |
908 /* (symbol object_initializer_name defined above) */ \ | 879 /* (symbol object_initializer_name defined above) */ \ |
909 \ | 880 \ |
910 do_intrinsic(_invoke, java_lang_reflect_Method, invoke_name, object_object_array_object_signature, F_R) \ | 881 do_intrinsic(_invoke, java_lang_reflect_Method, invoke_name, object_object_array_object_signature, F_R) \ |
911 /* (symbols invoke_name and invoke_signature defined above) */ \ | 882 /* (symbols invoke_name and invoke_signature defined above) */ \ |
912 do_intrinsic(_checkSpreadArgument, java_lang_invoke_MethodHandleNatives, checkSpreadArgument_name, checkSpreadArgument_signature, F_S) \ | 883 do_intrinsic(_checkSpreadArgument, java_lang_invoke_MethodHandleNatives, checkSpreadArgument_name, checkSpreadArgument_signature, F_S) \ |
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 */ \ | |
915 do_name( checkSpreadArgument_name, "checkSpreadArgument") \ | 884 do_name( checkSpreadArgument_name, "checkSpreadArgument") \ |
916 do_name( checkSpreadArgument_signature, "(Ljava/lang/Object;I)V") \ | 885 do_name( checkSpreadArgument_signature, "(Ljava/lang/Object;I)V") \ |
917 do_intrinsic(_invokeExact, java_lang_invoke_MethodHandle, invokeExact_name, object_array_object_signature, F_RN) \ | 886 do_intrinsic(_invokeExact, java_lang_invoke_MethodHandle, invokeExact_name, object_array_object_signature, F_RN) \ |
918 do_intrinsic(_invokeGeneric, java_lang_invoke_MethodHandle, invokeGeneric_name, object_array_object_signature, F_RN) \ | 887 do_intrinsic(_invokeGeneric, java_lang_invoke_MethodHandle, invokeGeneric_name, object_array_object_signature, F_RN) \ |
919 do_intrinsic(_invokeVarargs, java_lang_invoke_MethodHandle, invokeVarargs_name, object_array_object_signature, F_R) \ | 888 do_intrinsic(_invokeVarargs, java_lang_invoke_MethodHandle, invokeVarargs_name, object_array_object_signature, F_R) \ |