*** old/src/share/vm/oops/methodOop.cpp	Thu Mar  3 02:25:21 2011
--- new/src/share/vm/oops/methodOop.cpp	Thu Mar  3 02:25:21 2011

*** 840,850 ****
--- 840,850 ----
    switch (name_sid) {
    case vmSymbols::VM_SYMBOL_ENUM_NAME(invokeExact_name):
    case vmSymbols::VM_SYMBOL_ENUM_NAME(invokeGeneric_name):
      return true;
    }
!   if ((AllowTransitionalJSR292 || AllowInvokeForInvokeGeneric)
        && name_sid == vmSymbols::VM_SYMBOL_ENUM_NAME(invoke_name))
      return true;
    return false;
  }
  

*** 1112,1122 ****
--- 1112,1123 ----
        break;
      case vmSymbols::VM_SYMBOL_ENUM_NAME(invokeExact_name):
        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;
    case vmSymbols::VM_SYMBOL_ENUM_NAME(java_dyn_InvokeDynamic):
      if (!is_static() || !is_native())  break;