inference: check glb conflicts after flatten in intersection type(IDEA-181017)

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/IDEA57494.java

@@ -11,6 +11,6 @@ abstract class A1{
     abstract <T> T baz(List<? super T> a);
 
     void bar(List<?> x){
-        String o = <error descr="Incompatible upper bounds: Object, capture of ?, String">baz(x);</error>
+        String o = <error descr="Type parameter T has incompatible upper bounds: capture of ? and String">baz(x);</error>
     }
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/graphInference/CheckGlbConflictsAfterIntersectionTypeCreated.java

@@ -0,0 +1,30 @@
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+class Test {
+  private Map<FilterHelper, Integer> extractFilterCounts() {
+    final Function<FilterData, Integer> count = f -> null;
+    final Function<? super FilterData, ? extends FilterHelper> mapper = f -> null;
+    final List<FilterData> rows = Collections.emptyList();
+    return rows.stream().collect(Collectors.toMap(mapper, count));
+  }
+
+  private class FilterHelper {}
+
+  private class FilterData {}
+}
+
+class Test1 {
+  private void extractFilterCounts(final I<Integer> i1,
+                                   final I<? super Integer> i2) {
+    m(i2, i1);
+  }
+
+  private static <T> void m(I<? super T> i1, I<? super T> i2) { }
+
+  static class I<T> {}
+}