1.1 --- a/src/share/vm/prims/methodHandles.cpp Wed Aug 01 14:44:26 2012 -0700
1.2 +++ b/src/share/vm/prims/methodHandles.cpp Tue Aug 07 14:32:08 2012 -0700
1.3 @@ -1196,21 +1196,6 @@
1.4 }
1.5 JVM_END
1.6
1.7 -JVM_ENTRY(jobject, MH_invoke_UOE(JNIEnv *env, jobject igmh, jobjectArray igargs)) {
1.8 - TempNewSymbol UOE_name = SymbolTable::new_symbol("java/lang/UnsupportedOperationException", CHECK_NULL);
1.9 - THROW_MSG_NULL(UOE_name, "MethodHandle.invoke cannot be invoked reflectively");
1.10 - return NULL;
1.11 -}
1.12 -JVM_END
1.13 -
1.14 -JVM_ENTRY(jobject, MH_invokeExact_UOE(JNIEnv *env, jobject igmh, jobjectArray igargs)) {
1.15 - TempNewSymbol UOE_name = SymbolTable::new_symbol("java/lang/UnsupportedOperationException", CHECK_NULL);
1.16 - THROW_MSG_NULL(UOE_name, "MethodHandle.invokeExact cannot be invoked reflectively");
1.17 - return NULL;
1.18 -}
1.19 -JVM_END
1.20 -
1.21 -
1.22 /// JVM_RegisterMethodHandleMethods
1.23
1.24 #undef CS // Solaris builds complain
1.25 @@ -1248,11 +1233,6 @@
1.26 {CC"getMemberVMInfo", CC"("MEM")"OBJ, FN_PTR(MHN_getMemberVMInfo)}
1.27 };
1.28
1.29 -static JNINativeMethod invoke_methods[] = {
1.30 - {CC"invoke", CC"(["OBJ")"OBJ, FN_PTR(MH_invoke_UOE)},
1.31 - {CC"invokeExact", CC"(["OBJ")"OBJ, FN_PTR(MH_invokeExact_UOE)}
1.32 -};
1.33 -
1.34 // This one function is exported, used by NativeLookup.
1.35
1.36 JVM_ENTRY(void, JVM_RegisterMethodHandleMethods(JNIEnv *env, jclass MHN_class)) {
1.37 @@ -1278,9 +1258,6 @@
1.38 ThreadToNativeFromVM ttnfv(thread);
1.39
1.40 status = env->RegisterNatives(MHN_class, required_methods_JDK8, sizeof(required_methods_JDK8)/sizeof(JNINativeMethod));
1.41 - if (status == JNI_OK && !env->ExceptionOccurred()) {
1.42 - status = env->RegisterNatives(MH_class, invoke_methods, sizeof(invoke_methods)/sizeof(JNINativeMethod));
1.43 - }
1.44 if (status != JNI_OK || env->ExceptionOccurred()) {
1.45 warning("JSR 292 method handle code is mismatched to this JVM. Disabling support.");
1.46 enable_MH = false;
