--- a/meth.patch	Wed Jul 01 13:28:18 2009 +0200
+++ b/meth.patch	Thu Jul 02 03:38:45 2009 -0700
@@ -330,11 +330,15 @@ diff --git a/src/share/vm/prims/methodHa
      case _adapter_prim_to_prim:
        if (!is_java_primitive(src) || !is_java_primitive(dest) || src == dest) {
          err = "adapter requires primitive src/dest conversion subfields"; break;
-@@ -1618,7 +1677,7 @@
+@@ -1616,9 +1675,9 @@
+           err = "adapter requires src/dest conversion subfields for swap"; break;
+         }
          int swap_size = type2size[src];
-         oop src_mtype  = sun_dyn_AdapterMethodHandle::type(target());
-         oop dest_mtype = sun_dyn_AdapterMethodHandle::type(mh());
+-        oop src_mtype  = sun_dyn_AdapterMethodHandle::type(target());
+-        oop dest_mtype = sun_dyn_AdapterMethodHandle::type(mh());
 -        int slot_limit = sun_dyn_AdapterMethodHandle::vmslots(src_mtype);
++        oop src_mtype  = sun_dyn_AdapterMethodHandle::type(mh());
++        oop dest_mtype = sun_dyn_AdapterMethodHandle::type(target());
 +        int slot_limit = sun_dyn_AdapterMethodHandle::vmslots(target());
          int src_slot   = argslot;
          int dest_slot  = vminfo;