--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java	Thu Jul 30 13:20:01 2015 +0100
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java	Thu Jul 30 13:21:01 2015 +0100
@@ -3084,7 +3084,7 @@
             if (!unboxedTarget.hasTag(NONE)) {
                 if (!types.isSubtype(tree.type, unboxedTarget)) //e.g. Character c = 89;
                     tree.type = unboxedTarget.constType(tree.type.constValue());
-                return (T)boxPrimitive((JCExpression)tree, type);
+                return (T)boxPrimitive((JCExpression)tree, types.erasure(type));
             } else {
                 tree = (T)boxPrimitive((JCExpression)tree);
             }