inference: force incorporation after reduce

java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/FunctionalInterfaceParameterizationUtil.java

@@ -105,7 +105,7 @@ public class FunctionalInterfaceParameterizationUtil {
                                                          session.substituteWithInferenceVariables(targetMethodParams[i].getType())));
       }
 
-      if (!session.repeatInferencePhases(false)) {
+      if (!session.repeatInferencePhases(true)) {
         return null;
       }
 

java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/MethodReferenceResolver.java

@@ -121,7 +121,7 @@ public class MethodReferenceResolver implements ResolveCache.PolyVariantContextR
                     return psiSubstitutor;
                   }
 
-                  if (!session.repeatInferencePhases(false)) {
+                  if (!session.repeatInferencePhases(true)) {
                     return substitutor;
                   }
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newMethodRef/HighlightReferenceWhenContradictBoundsAreInferred.java

@@ -29,9 +29,9 @@ class Test {
     static void meth4(I3 s) { }
 
     static {
-        meth1(Foo::<error descr="Invalid constructor reference: String cannot be converted to X">new</error>);
+        meth1(Foo::<error descr="Invalid constructor reference: String cannot be converted to Number">new</error>);
         meth2(Foo::new);
-        meth3(Foo::<error descr="Invalid constructor reference: Object cannot be converted to X">new</error>);
+        meth3(Foo::<error descr="Invalid constructor reference: Object cannot be converted to Number">new</error>);
         meth4<error descr="Ambiguous method call: both 'Test.meth4(I1)' and 'Test.meth4(I2)' match">(Foo::new)</error>;
 
         meth1(Test::<error descr="Invalid method reference: String cannot be converted to X">foo</error>);