diff -up ./openjdk-boot/jdk/src/share/classes/java/lang/invoke/CallSite.java.sav ./openjdk-boot/jdk/src/share/classes/java/lang/invoke/CallSite.java

--- ./openjdk-boot/jdk/src/share/classes/java/lang/invoke/CallSite.java.sav	2011-06-27 13:28:34.000000000 -0400

+++ ./openjdk-boot/jdk/src/share/classes/java/lang/invoke/CallSite.java	2011-07-06 13:14:16.239382320 -0400

@@ -329,7 +329,7 @@ public class CallSite {

     private static Object maybeReBox(Object x) {

         if (x instanceof Integer) {

-            int xi = (int) x;

+            int xi = (Integer) x;

             if (xi == (byte) xi)

                 x = xi;  // must rebox; see JLS 5.1.7

         }

diff -up ./openjdk-boot/jdk/src/share/classes/java/lang/invoke/FromGeneric.java.sav ./openjdk-boot/jdk/src/share/classes/java/lang/invoke/FromGeneric.java

--- ./openjdk-boot/jdk/src/share/classes/java/lang/invoke/FromGeneric.java.sav	2011-06-27 13:28:35.000000000 -0400

+++ ./openjdk-boot/jdk/src/share/classes/java/lang/invoke/FromGeneric.java	2011-07-06 13:14:16.240382297 -0400

@@ -505,10 +505,10 @@ class genclasses {

         protected A0 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t)

                         { return new A0(e, i, c, t); }

         protected Object invoke_L0() throws Throwable { return convert_L((Object)invoker.invokeExact(target)); }

-        protected Object invoke_I0() throws Throwable { return convert_I((int)   invoker.invokeExact(target)); }

-        protected Object invoke_J0() throws Throwable { return convert_J((long)  invoker.invokeExact(target)); }

-        protected Object invoke_F0() throws Throwable { return convert_F((float) invoker.invokeExact(target)); }

-        protected Object invoke_D0() throws Throwable { return convert_D((double)invoker.invokeExact(target)); }

+        protected Object invoke_I0() throws Throwable { return convert_I((Integer)   invoker.invokeExact(target)); }

+        protected Object invoke_J0() throws Throwable { return convert_J((Long)  invoker.invokeExact(target)); }

+        protected Object invoke_F0() throws Throwable { return convert_F((Float) invoker.invokeExact(target)); }

+        protected Object invoke_D0() throws Throwable { return convert_D((Double)invoker.invokeExact(target)); }

     }

     static class A1 extends Adapter {

         protected A1(MethodHandle entryPoint) { super(entryPoint); }  // to build prototype

@@ -517,10 +517,10 @@ class genclasses {

         protected A1 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t)

                         { return new A1(e, i, c, t); }

         protected Object invoke_L1(Object a0) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0)); }

-        protected Object invoke_I1(Object a0) throws Throwable { return convert_I((int)   invoker.invokeExact(target, a0)); }

-        protected Object invoke_J1(Object a0) throws Throwable { return convert_J((long)  invoker.invokeExact(target, a0)); }

-        protected Object invoke_F1(Object a0) throws Throwable { return convert_F((float) invoker.invokeExact(target, a0)); }

-        protected Object invoke_D1(Object a0) throws Throwable { return convert_D((double)invoker.invokeExact(target, a0)); }

+        protected Object invoke_I1(Object a0) throws Throwable { return convert_I((Integer)   invoker.invokeExact(target, a0)); }

+        protected Object invoke_J1(Object a0) throws Throwable { return convert_J((Long)  invoker.invokeExact(target, a0)); }

+        protected Object invoke_F1(Object a0) throws Throwable { return convert_F((Float) invoker.invokeExact(target, a0)); }

+        protected Object invoke_D1(Object a0) throws Throwable { return convert_D((Double)invoker.invokeExact(target, a0)); }

     }

     static class A2 extends Adapter {

         protected A2(MethodHandle entryPoint) { super(entryPoint); }  // to build prototype

@@ -529,10 +529,10 @@ class genclasses {

         protected A2 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t)

                         { return new A2(e, i, c, t); }

         protected Object invoke_L2(Object a0, Object a1) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0, a1)); }

-        protected Object invoke_I2(Object a0, Object a1) throws Throwable { return convert_I((int)   invoker.invokeExact(target, a0, a1)); }

-        protected Object invoke_J2(Object a0, Object a1) throws Throwable { return convert_J((long)  invoker.invokeExact(target, a0, a1)); }

-        protected Object invoke_F2(Object a0, Object a1) throws Throwable { return convert_F((float) invoker.invokeExact(target, a0, a1)); }

-        protected Object invoke_D2(Object a0, Object a1) throws Throwable { return convert_D((double)invoker.invokeExact(target, a0, a1)); }

+        protected Object invoke_I2(Object a0, Object a1) throws Throwable { return convert_I((Integer)   invoker.invokeExact(target, a0, a1)); }

+        protected Object invoke_J2(Object a0, Object a1) throws Throwable { return convert_J((Long)  invoker.invokeExact(target, a0, a1)); }

+        protected Object invoke_F2(Object a0, Object a1) throws Throwable { return convert_F((Float) invoker.invokeExact(target, a0, a1)); }

+        protected Object invoke_D2(Object a0, Object a1) throws Throwable { return convert_D((Double)invoker.invokeExact(target, a0, a1)); }

     }

     static class A3 extends Adapter {

         protected A3(MethodHandle entryPoint) { super(entryPoint); }  // to build prototype

@@ -541,10 +541,10 @@ class genclasses {

         protected A3 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t)

                         { return new A3(e, i, c, t); }

         protected Object invoke_L3(Object a0, Object a1, Object a2) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0, a1, a2)); }

-        protected Object invoke_I3(Object a0, Object a1, Object a2) throws Throwable { return convert_I((int)   invoker.invokeExact(target, a0, a1, a2)); }

-        protected Object invoke_J3(Object a0, Object a1, Object a2) throws Throwable { return convert_J((long)  invoker.invokeExact(target, a0, a1, a2)); }

-        protected Object invoke_F3(Object a0, Object a1, Object a2) throws Throwable { return convert_F((float) invoker.invokeExact(target, a0, a1, a2)); }

-        protected Object invoke_D3(Object a0, Object a1, Object a2) throws Throwable { return convert_D((double)invoker.invokeExact(target, a0, a1, a2)); }

+        protected Object invoke_I3(Object a0, Object a1, Object a2) throws Throwable { return convert_I((Integer)   invoker.invokeExact(target, a0, a1, a2)); }

+        protected Object invoke_J3(Object a0, Object a1, Object a2) throws Throwable { return convert_J((Long)  invoker.invokeExact(target, a0, a1, a2)); }

+        protected Object invoke_F3(Object a0, Object a1, Object a2) throws Throwable { return convert_F((Float) invoker.invokeExact(target, a0, a1, a2)); }

+        protected Object invoke_D3(Object a0, Object a1, Object a2) throws Throwable { return convert_D((Double)invoker.invokeExact(target, a0, a1, a2)); }

     }

     static class A4 extends Adapter {

         protected A4(MethodHandle entryPoint) { super(entryPoint); }  // to build prototype

@@ -553,10 +553,10 @@ class genclasses {

         protected A4 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t)

                         { return new A4(e, i, c, t); }

         protected Object invoke_L4(Object a0, Object a1, Object a2, Object a3) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0, a1, a2, a3)); }

-        protected Object invoke_I4(Object a0, Object a1, Object a2, Object a3) throws Throwable { return convert_I((int)   invoker.invokeExact(target, a0, a1, a2, a3)); }

-        protected Object invoke_J4(Object a0, Object a1, Object a2, Object a3) throws Throwable { return convert_J((long)  invoker.invokeExact(target, a0, a1, a2, a3)); }

-        protected Object invoke_F4(Object a0, Object a1, Object a2, Object a3) throws Throwable { return convert_F((float) invoker.invokeExact(target, a0, a1, a2, a3)); }

-        protected Object invoke_D4(Object a0, Object a1, Object a2, Object a3) throws Throwable { return convert_D((double)invoker.invokeExact(target, a0, a1, a2, a3)); }

+        protected Object invoke_I4(Object a0, Object a1, Object a2, Object a3) throws Throwable { return convert_I((Integer)   invoker.invokeExact(target, a0, a1, a2, a3)); }

+        protected Object invoke_J4(Object a0, Object a1, Object a2, Object a3) throws Throwable { return convert_J((Long)  invoker.invokeExact(target, a0, a1, a2, a3)); }

+        protected Object invoke_F4(Object a0, Object a1, Object a2, Object a3) throws Throwable { return convert_F((Float) invoker.invokeExact(target, a0, a1, a2, a3)); }

+        protected Object invoke_D4(Object a0, Object a1, Object a2, Object a3) throws Throwable { return convert_D((Double)invoker.invokeExact(target, a0, a1, a2, a3)); }

     }

     static class A5 extends Adapter {

         protected A5(MethodHandle entryPoint) { super(entryPoint); }  // to build prototype

@@ -565,10 +565,10 @@ class genclasses {

         protected A5 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t)

                         { return new A5(e, i, c, t); }

         protected Object invoke_L5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0, a1, a2, a3, a4)); }

-        protected Object invoke_I5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { return convert_I((int)   invoker.invokeExact(target, a0, a1, a2, a3, a4)); }

-        protected Object invoke_J5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { return convert_J((long)  invoker.invokeExact(target, a0, a1, a2, a3, a4)); }

-        protected Object invoke_F5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { return convert_F((float) invoker.invokeExact(target, a0, a1, a2, a3, a4)); }

-        protected Object invoke_D5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { return convert_D((double)invoker.invokeExact(target, a0, a1, a2, a3, a4)); }

+        protected Object invoke_I5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { return convert_I((Integer)   invoker.invokeExact(target, a0, a1, a2, a3, a4)); }

+        protected Object invoke_J5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { return convert_J((Long)  invoker.invokeExact(target, a0, a1, a2, a3, a4)); }

+        protected Object invoke_F5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { return convert_F((Float) invoker.invokeExact(target, a0, a1, a2, a3, a4)); }

+        protected Object invoke_D5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { return convert_D((Double)invoker.invokeExact(target, a0, a1, a2, a3, a4)); }

     }

     static class A6 extends Adapter {

         protected A6(MethodHandle entryPoint) { super(entryPoint); }  // to build prototype

@@ -577,10 +577,10 @@ class genclasses {

         protected A6 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t)

                         { return new A6(e, i, c, t); }

         protected Object invoke_L6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5)); }

-        protected Object invoke_I6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { return convert_I((int)   invoker.invokeExact(target, a0, a1, a2, a3, a4, a5)); }

-        protected Object invoke_J6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { return convert_J((long)  invoker.invokeExact(target, a0, a1, a2, a3, a4, a5)); }

-        protected Object invoke_F6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { return convert_F((float) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5)); }

-        protected Object invoke_D6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { return convert_D((double)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5)); }

+        protected Object invoke_I6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { return convert_I((Integer)   invoker.invokeExact(target, a0, a1, a2, a3, a4, a5)); }

+        protected Object invoke_J6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { return convert_J((Long)  invoker.invokeExact(target, a0, a1, a2, a3, a4, a5)); }

+        protected Object invoke_F6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { return convert_F((Float) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5)); }

+        protected Object invoke_D6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { return convert_D((Double)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5)); }

     }

     static class A7 extends Adapter {

         protected A7(MethodHandle entryPoint) { super(entryPoint); }  // to build prototype

@@ -589,10 +589,10 @@ class genclasses {

         protected A7 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t)

                         { return new A7(e, i, c, t); }

         protected Object invoke_L7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6)); }

-        protected Object invoke_I7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { return convert_I((int)   invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6)); }

-        protected Object invoke_J7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { return convert_J((long)  invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6)); }

-        protected Object invoke_F7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { return convert_F((float) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6)); }

-        protected Object invoke_D7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { return convert_D((double)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6)); }

+        protected Object invoke_I7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { return convert_I((Integer)   invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6)); }

+        protected Object invoke_J7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { return convert_J((Long)  invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6)); }

+        protected Object invoke_F7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { return convert_F((Float) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6)); }

+        protected Object invoke_D7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { return convert_D((Double)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6)); }

     }

     static class A8 extends Adapter {

         protected A8(MethodHandle entryPoint) { super(entryPoint); }  // to build prototype

@@ -601,10 +601,10 @@ class genclasses {

         protected A8 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t)

                         { return new A8(e, i, c, t); }

         protected Object invoke_L8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7)); }

-        protected Object invoke_I8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { return convert_I((int)   invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7)); }

-        protected Object invoke_J8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { return convert_J((long)  invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7)); }

-        protected Object invoke_F8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { return convert_F((float) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7)); }

-        protected Object invoke_D8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { return convert_D((double)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7)); }

+        protected Object invoke_I8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { return convert_I((Integer)   invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7)); }

+        protected Object invoke_J8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { return convert_J((Long)  invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7)); }

+        protected Object invoke_F8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { return convert_F((Float) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7)); }

+        protected Object invoke_D8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { return convert_D((Double)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7)); }

     }

     static class A9 extends Adapter {

         protected A9(MethodHandle entryPoint) { super(entryPoint); }  // to build prototype

@@ -613,10 +613,10 @@ class genclasses {

         protected A9 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t)

                         { return new A9(e, i, c, t); }

         protected Object invoke_L9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8)); }

-        protected Object invoke_I9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { return convert_I((int)   invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8)); }

-        protected Object invoke_J9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { return convert_J((long)  invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8)); }

-        protected Object invoke_F9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { return convert_F((float) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8)); }

-        protected Object invoke_D9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { return convert_D((double)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8)); }

+        protected Object invoke_I9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { return convert_I((Integer)   invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8)); }

+        protected Object invoke_J9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { return convert_J((Long)  invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8)); }

+        protected Object invoke_F9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { return convert_F((Float) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8)); }

+        protected Object invoke_D9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { return convert_D((Double)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8)); }

     }

     static class A10 extends Adapter {

         protected A10(MethodHandle entryPoint) { super(entryPoint); }  // to build prototype

@@ -625,9 +625,9 @@ class genclasses {

         protected A10 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t)

                         { return new A10(e, i, c, t); }

         protected Object invoke_L10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)); }

-        protected Object invoke_I10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { return convert_I((int)   invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)); }

-        protected Object invoke_J10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { return convert_J((long)  invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)); }

-        protected Object invoke_F10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { return convert_F((float) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)); }

-        protected Object invoke_D10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { return convert_D((double)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)); }

+        protected Object invoke_I10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { return convert_I((Integer)   invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)); }

+        protected Object invoke_J10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { return convert_J((Long)  invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)); }

+        protected Object invoke_F10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { return convert_F((Float) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)); }

+        protected Object invoke_D10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { return convert_D((Double)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)); }

     }

 }

diff -up ./openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java.sav ./openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java

--- ./openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java.sav	2011-06-27 13:28:36.000000000 -0400

+++ ./openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java	2011-07-06 13:14:16.240382297 -0400

@@ -956,52 +956,52 @@ import static java.lang.invoke.MethodHan

             return addTypeString(target, this);

         }

         private Object invoke_V(Object... av) throws Throwable {

-            if ((boolean) test.invokeExact(av))

+            if ((Boolean) test.invokeExact(av))

                 return target.invokeExact(av);

             return fallback.invokeExact(av);

         }

         private Object invoke_L0() throws Throwable {

-            if ((boolean) test.invokeExact())

+            if ((Boolean) test.invokeExact())

                 return target.invokeExact();

             return fallback.invokeExact();

         }

         private Object invoke_L1(Object a0) throws Throwable {

-            if ((boolean) test.invokeExact(a0))

+            if ((Boolean) test.invokeExact(a0))

                 return target.invokeExact(a0);

             return fallback.invokeExact(a0);

         }

         private Object invoke_L2(Object a0, Object a1) throws Throwable {

-            if ((boolean) test.invokeExact(a0, a1))

+            if ((Boolean) test.invokeExact(a0, a1))

                 return target.invokeExact(a0, a1);

             return fallback.invokeExact(a0, a1);

         }

         private Object invoke_L3(Object a0, Object a1, Object a2) throws Throwable {

-            if ((boolean) test.invokeExact(a0, a1, a2))

+            if ((Boolean) test.invokeExact(a0, a1, a2))

                 return target.invokeExact(a0, a1, a2);

             return fallback.invokeExact(a0, a1, a2);

         }

         private Object invoke_L4(Object a0, Object a1, Object a2, Object a3) throws Throwable {

-            if ((boolean) test.invokeExact(a0, a1, a2, a3))

+            if ((Boolean) test.invokeExact(a0, a1, a2, a3))

                 return target.invokeExact(a0, a1, a2, a3);

             return fallback.invokeExact(a0, a1, a2, a3);

         }

         private Object invoke_L5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable {

-            if ((boolean) test.invokeExact(a0, a1, a2, a3, a4))

+            if ((Boolean) test.invokeExact(a0, a1, a2, a3, a4))

                 return target.invokeExact(a0, a1, a2, a3, a4);

             return fallback.invokeExact(a0, a1, a2, a3, a4);

         }

         private Object invoke_L6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable {

-            if ((boolean) test.invokeExact(a0, a1, a2, a3, a4, a5))

+            if ((Boolean) test.invokeExact(a0, a1, a2, a3, a4, a5))

                 return target.invokeExact(a0, a1, a2, a3, a4, a5);

             return fallback.invokeExact(a0, a1, a2, a3, a4, a5);

         }

         private Object invoke_L7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable {

-            if ((boolean) test.invokeExact(a0, a1, a2, a3, a4, a5, a6))

+            if ((Boolean) test.invokeExact(a0, a1, a2, a3, a4, a5, a6))

                 return target.invokeExact(a0, a1, a2, a3, a4, a5, a6);

             return fallback.invokeExact(a0, a1, a2, a3, a4, a5, a6);

         }

         private Object invoke_L8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable {

-            if ((boolean) test.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7))

+            if ((Boolean) test.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7))

                 return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7);

             return fallback.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7);

         }

diff -up ./openjdk-boot/jdk/src/share/classes/java/lang/invoke/ToGeneric.java.sav ./openjdk-boot/jdk/src/share/classes/java/lang/invoke/ToGeneric.java

--- ./openjdk-boot/jdk/src/share/classes/java/lang/invoke/ToGeneric.java.sav	2011-06-27 13:28:38.000000000 -0400

+++ ./openjdk-boot/jdk/src/share/classes/java/lang/invoke/ToGeneric.java	2011-07-06 13:14:16.241382276 -0400

@@ -394,10 +394,10 @@ class ToGeneric {

         // Code to run when the generic target has finished and produced a value.

         protected Object return_L(Object res) throws Throwable { return (Object)convert.invokeExact(res); }

-        protected int    return_I(Object res) throws Throwable { return (int)   convert.invokeExact(res); }

-        protected long   return_J(Object res) throws Throwable { return (long)  convert.invokeExact(res); }

-        protected float  return_F(Object res) throws Throwable { return (float) convert.invokeExact(res); }

-        protected double return_D(Object res) throws Throwable { return (double)convert.invokeExact(res); }

+        protected int    return_I(Object res) throws Throwable { return (Integer)   convert.invokeExact(res); }

+        protected long   return_J(Object res) throws Throwable { return (Long)  convert.invokeExact(res); }

+        protected float  return_F(Object res) throws Throwable { return (Float) convert.invokeExact(res); }

+        protected double return_D(Object res) throws Throwable { return (Double)convert.invokeExact(res); }

         static private final String CLASS_PREFIX; // "java.lang.invoke.ToGeneric$"

         static {

diff -up ./openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java.sav ./openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java

--- ./openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java.sav	2011-06-27 13:36:46.000000000 -0400

+++ ./openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java	2011-07-06 13:14:30.892131655 -0400

@@ -223,9 +223,9 @@ public class ValueConversions {

         if (x instanceof Number) {

             res = (Number) x;

         } else if (x instanceof Boolean) {

-            res = ((boolean)x ? ONE_INT : ZERO_INT);

+            res = ((Boolean)x ? ONE_INT : ZERO_INT);

         } else if (x instanceof Character) {

-            res = (int)(char)x;

+            res = (int)(Character)x;

         } else {

             // this will fail with the required ClassCastException:

             res = (Number) x;

@@ -386,7 +386,7 @@ public class ValueConversions {

     static int unboxRawInteger(Object x) {

         if (x instanceof Integer)

-            return (int) x;

+            return (Integer) x;

         else

             return (int) unboxLong(x, false);

     }