*** old/src/cpu/zero/vm/cppInterpreter_zero.cpp	Thu Jun 16 10:41:43 2011
--- new/src/cpu/zero/vm/cppInterpreter_zero.cpp	Thu Jun 16 10:41:43 2011

*** 655,665 ****
--- 655,665 ----
    oop mhtype = java_lang_invoke_MethodHandle::type(method_handle);
    bool is_exact = mhtype == method_type;
    if (!is_exact) {
      if (method->intrinsic_id() == vmIntrinsics::_invokeExact) {
        CALL_VM_NOCHECK_NOFIX(
!         InterpreterRuntime::throw_WrongMethodTypeException(
!         SharedRuntime::throw_WrongMethodTypeException(
            thread, method_type, mhtype));
        // NB all oops trashed!
        assert(HAS_PENDING_EXCEPTION, "should do");
        stack->set_sp(unwind_sp);
        return 0;

*** 671,681 ****
--- 671,681 ----
      // "genericInvoker") is really really odd.  I'm hoping it's trying
      // to accomodate odd VM/class library combinations I can ignore.
      oop adapter = java_lang_invoke_MethodTypeForm::genericInvoker(form);
      if (adapter == NULL) {
        CALL_VM_NOCHECK_NOFIX(
!         InterpreterRuntime::throw_WrongMethodTypeException(
!         SharedRuntime::throw_WrongMethodTypeException(
            thread, method_type, mhtype));
        // NB all oops trashed!
        assert(HAS_PENDING_EXCEPTION, "should do");
        stack->set_sp(unwind_sp);
        return 0;