6611449: Internal Error thrown during generic method/constructor invocation

Summary: type-inference should fail since lub is not defined for primitive types
Reviewed-by: jjg

src/share/classes/com/sun/tools/javac/code/Types.java

@@ -2483,7 +2483,7 @@ public class Types {
                 break;
             default:
                 if (t.isPrimitive())
-                    return syms.botType;
+                    return syms.errType;
             }
         }
         switch (boundkind) {

src/share/classes/com/sun/tools/javac/comp/Infer.java

@@ -194,14 +194,14 @@ public class Infer {
             if (that.lobounds.isEmpty())
                 that.inst = syms.botType;
             else if (that.lobounds.tail.isEmpty())
-                that.inst = that.lobounds.head;
+                that.inst = that.lobounds.head.isPrimitive() ? syms.errType : that.lobounds.head;
             else {
                 that.inst = types.lub(that.lobounds);
-                if (that.inst == null)
+            }
+            if (that.inst == null || that.inst == syms.errType)
                     throw ambiguousNoInstanceException
                         .setMessage("no.unique.minimal.instance.exists",
                                     that.qtype, that.lobounds);
-            }
             // VGJ: sort of inlined maximizeInst() below.  Adding
             // bounds can cause lobounds that are above hibounds.
             if (that.hibounds.isEmpty())

test/tools/javac/generics/inference/6611449/T6611449.java

+/*
+ * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/**
+ * @test
+ * @bug 6611449
+ * @summary Internal Error thrown during generic method/constructor invocation
+ * @compile/fail/ref=T6611449.out -XDstdout -XDrawDiagnostics T6611449.java
+ */
+public class T6611449<S> {
+
+    T6611449() {this(1);}
+
+    <T extends S> T6611449(T t1) {this(t1, 1);}
+
+    <T extends S> T6611449(T t1, T t2) {}
+
+    <T extends S> void m(T t1) {}
+
+    <T extends S> void m(T t1, T t2) {}
+
+    void test() {
+        m1(1);
+        m2(1, 1);
+    }
+}

test/tools/javac/generics/inference/6611449/T6611449.out

+T6611449.java:32:17: compiler.err.cant.resolve.location: (- compiler.misc.kindname.constructor), T6611449, (int), , (- compiler.misc.kindname.class), T6611449<S>
+T6611449.java:34:35: compiler.err.cant.resolve.location: (- compiler.misc.kindname.constructor), T6611449, (T,int), , (- compiler.misc.kindname.class), T6611449<S>
+T6611449.java:43:9: compiler.err.cant.resolve.location: (- compiler.misc.kindname.method), m1, (int), , (- compiler.misc.kindname.class), T6611449<S>
+T6611449.java:44:9: compiler.err.cant.resolve.location: (- compiler.misc.kindname.method), m2, (int,int), , (- compiler.misc.kindname.class), T6611449<S>
+4 errors