6683438: Bad regression test for CR 6611449
The regression test for CR 6611449 contains some inconstistencies
Reviewed-by: jjg
diff --git a/langtools/test/tools/javac/generics/inference/6611449/T6611449.java b/langtools/test/tools/javac/generics/inference/6611449/T6611449.java
index 8f2378e..8ef523d 100644
--- a/langtools/test/tools/javac/generics/inference/6611449/T6611449.java
+++ b/langtools/test/tools/javac/generics/inference/6611449/T6611449.java
@@ -29,18 +29,18 @@
*/
public class T6611449<S> {
- T6611449() {this(1);}
-
- <T extends S> T6611449(T t1) {this(t1, 1);}
+ <T extends S> T6611449(T t1) {}
<T extends S> T6611449(T t1, T t2) {}
- <T extends S> void m(T t1) {}
+ <T extends S> void m1(T t1) {}
- <T extends S> void m(T t1, T t2) {}
+ <T extends S> void m2(T t1, T t2) {}
void test() {
+ new T6611449<S>(1);
+ new T6611449<S>(1, 1); //internal error: lub is erroneously applied to primitive types
m1(1);
- m2(1, 1);
+ m2(1, 1); //internal error: lub is erroneously applied to primitive types
}
}
diff --git a/langtools/test/tools/javac/generics/inference/6611449/T6611449.out b/langtools/test/tools/javac/generics/inference/6611449/T6611449.out
index ed501cb..dcadfe0 100644
--- a/langtools/test/tools/javac/generics/inference/6611449/T6611449.out
+++ b/langtools/test/tools/javac/generics/inference/6611449/T6611449.out
@@ -1,5 +1,5 @@
-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>
+T6611449.java:41:9: compiler.err.cant.resolve.location: (- compiler.misc.kindname.constructor), T6611449, (int), , (- compiler.misc.kindname.class), T6611449<S>
+T6611449.java:42:9: compiler.err.cant.resolve.location: (- compiler.misc.kindname.constructor), T6611449, (int,int), , (- compiler.misc.kindname.class), T6611449<S>
+T6611449.java:43:9: compiler.err.cant.apply.symbol: <T>m1(T), T6611449<S>, , int, null
+T6611449.java:44:9: compiler.err.cant.apply.symbol: <T>m2(T,T), T6611449<S>, , int,int, null
4 errors
