*** old/src/cpu/x86/vm/stubGenerator_x86_64.cpp	Thu Jun 16 10:41:41 2011
--- new/src/cpu/x86/vm/stubGenerator_x86_64.cpp	Thu Jun 16 10:41:41 2011

*** 2932,2942 ****
--- 2932,2944 ----
    // AbstractMethodError on entry) are either at call sites or
    // otherwise assume that stack unwinding will be initiated, so
    // caller saved registers were assumed volatile in the compiler.
    address generate_throw_exception(const char* name,
                                     address runtime_entry,
!                                    bool restore_saved_exception_pc) {
!                                    bool restore_saved_exception_pc,
+                                    Register arg1 = noreg,
+                                    Register arg2 = noreg) {
      // Information about frame layout at time of blocking runtime call.
      // Note that we only have to preserve callee-saved registers since
      // the compilers are responsible for supplying a continuation point
      // if they expect all registers to be preserved.
      enum layout {

*** 2978,2987 ****
--- 2980,2996 ----
  
      // Set up last_Java_sp and last_Java_fp
      __ set_last_Java_frame(rsp, rbp, NULL);
  
      // Call runtime
+     if (arg1 != noreg) {
+       assert(arg2 != c_rarg1, "clobbered");
+       __ movptr(c_rarg1, arg1);
+     }
+     if (arg2 != noreg) {
+       __ movptr(c_rarg2, arg2);
+     }
      __ movptr(c_rarg0, r15_thread);
      BLOCK_COMMENT("call runtime_entry");
      __ call(RuntimeAddress(runtime_entry));
  
      // Generate oop map

*** 3050,3059 ****
--- 3059,3076 ----
  
      // platform dependent
      StubRoutines::x86::_get_previous_fp_entry = generate_get_previous_fp();
  
      StubRoutines::x86::_verify_mxcsr_entry    = generate_verify_mxcsr();
+ 
+     // Build this early so it's available for the interpreter.  Stub
+     // expects the required and actual types as register arguments in
+     // j_rarg0 and j_rarg1 respectively.
+     StubRoutines::_throw_WrongMethodTypeException_entry =
+       generate_throw_exception("WrongMethodTypeException throw_exception",
+                                CAST_FROM_FN_PTR(address, SharedRuntime::throw_WrongMethodTypeException),
+                                false, rax, rcx);
    }
  
    void generate_all() {
      // Generates all stubs and initializes the entry points