--- a/hotspot/src/share/vm/oops/methodOop.cpp Fri Mar 11 21:19:15 2011 -0800
+++ b/hotspot/src/share/vm/oops/methodOop.cpp Fri Mar 11 22:33:47 2011 -0800
@@ -855,7 +855,7 @@
case vmSymbols::VM_SYMBOL_ENUM_NAME(invokeGeneric_name):
return true;
}
- if (AllowTransitionalJSR292
+ if ((AllowTransitionalJSR292 || AllowInvokeForInvokeGeneric)
&& name_sid == vmSymbols::VM_SYMBOL_ENUM_NAME(invoke_name))
return true;
return false;
@@ -1127,7 +1127,8 @@
id = vmIntrinsics::_invokeExact;
break;
case vmSymbols::VM_SYMBOL_ENUM_NAME(invoke_name):
- if (AllowTransitionalJSR292) id = vmIntrinsics::_invokeExact;
+ if (AllowInvokeForInvokeGeneric) id = vmIntrinsics::_invokeGeneric;
+ else if (AllowTransitionalJSR292) id = vmIntrinsics::_invokeExact;
break;
}
break;