good code is red: upper bound should move up if next parameter requires (IDEA-56696)

java/java-impl/src/com/intellij/psi/impl/source/resolve/PsiResolveHelperImpl.java

@@ -175,7 +175,7 @@ public class PsiResolveHelperImpl implements PsiResolveHelper {
             }
             break;
           case SUBTYPE:
-            if (PsiType.NULL.equals(upperBound)) {
+            if (PsiType.NULL.equals(upperBound) || TypeConversionUtil.isAssignable(upperBound, type)) {
               upperBound = type;
             }
         }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/InferenceWithUpperBoundPromotion.java

@@ -0,0 +1,30 @@
+
+public class NestedGenericGoodCodeIsRed {
+
+    public void main( String[] args ) {
+        satisfiesAllOf(isPositive(), isEqualTo(10.9));
+        satisfiesAllOf(isPositive(), isEqualTo(10));
+
+        Number num = null;
+        satisfiesAllOf(isPositive(), isEqualTo(num));
+
+        this.<Number>satisfiesAllOf<error descr="'satisfiesAllOf(NestedGenericGoodCodeIsRed.Predicate<? super java.lang.Number>, NestedGenericGoodCodeIsRed.Predicate<? super java.lang.Number>)' in 'NestedGenericGoodCodeIsRed' cannot be applied to '(NestedGenericGoodCodeIsRed.Predicate<java.lang.Number>, NestedGenericGoodCodeIsRed.Predicate<java.lang.Integer>)'">(isPositive(), isEqualTo(10))</error>;
+    }
+
+
+    public interface Predicate<T> {
+
+    }
+
+    public  <ALL> void satisfiesAllOf( Predicate<? super ALL> first, Predicate<? super ALL> second ) {
+    }
+
+    public  <POSITIVE extends Number> Predicate<POSITIVE> isPositive() {
+        return null;
+    }
+
+    public <EQUALTO extends Number> Predicate<EQUALTO> isEqualTo( EQUALTO target ) {
+        return null;
+    }
+
+}

java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java

@@ -50,6 +50,7 @@ public class GenericsHighlightingTest extends LightDaemonAnalyzerTestCase {
   public void testExplicitMethodParameters1() throws Exception { doTest(false); }
   public void testInferenceWithBounds() throws Exception {doTest(false);}
   public void testInferenceWithSuperBounds() throws Exception {doTest(false);}
+  public void testInferenceWithUpperBoundPromotion() throws Exception {doTest(false);}
   public void testVariance() throws Exception {doTest(false);}
   public void testForeachTypes() throws Exception {doTest(false);}
   public void testRawOverridingMethods() throws Exception {doTest(false);}