--- a/src/cpu/zero/vm/cppInterpreter_zero.cpp	Thu Mar 03 10:14:32 2011 +0000
+++ b/src/cpu/zero/vm/cppInterpreter_zero.cpp	Wed Mar 09 11:29:10 2011 +0000
@@ -652,16 +652,15 @@
     assert(method->intrinsic_id() == vmIntrinsics::_invokeGeneric, "should be");
 
     // Load up an adapter from the calling type
+    // NB the x86 code for this (in methodHandles_x86.cpp, search for
+    // "genericInvoker") is really really odd.  I'm hoping it's trying
+    // to accomodate odd VM/class library combinations I can ignore.
     oop invoker = java_dyn_MethodTypeForm::genericInvoker(methodtype_form);
-    if (invoker < methodtype_form) { // XXX really??
-      CALL_VM_NOCHECK_NOFIX(
-        InterpreterRuntime::throw_WrongMethodTypeException(
-          thread, method_type, mhtype));
-      // NB all oops trashed!
-      assert(HAS_PENDING_EXCEPTION, "should do");
-      stack->set_sp(stack->sp() + num_vmslots + 1);
-      return 0; // No deoptimized frames on the stack
-    }
+
+    tty->cr();
+    tty->print("invoker = ");
+    invoker->print_on(tty);
+     
 
     tty->cr();
     tty->print_cr("invoke_generic_slow_path: %d vmslots", num_vmslots);