Merge remote-tracking branch 'aosp/snapshot-master' into merge

1 files changed, 11 insertions, 0 deletions

diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA67865.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA67865.java
new file mode 100644
index 000000000000..ab7d8cf9cc2d
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA67865.java
@@ -0,0 +1,11 @@
+import java.util.*;
+
+abstract class A {
+    static <T> void foo(List<T> x) { }
+    static <T extends List<?>> void foo(Collection<T> x) { }
+    public static void main(String[] args){
+        List<List<String>> x = null;
+        foo<error descr="Ambiguous method call: both 'A.foo(List<List<String>>)' and 'A.foo(Collection<List<String>>)' match">(x)</error>;
+        foo<error descr="Ambiguous method call: both 'A.foo(List<Object>)' and 'A.foo(Collection<List<?>>)' match">(null)</error>;
+    }
+}