new inference: do not incorporate during B1 phase; TypeCompatibilityConstraint reduces to true for raw substitution and erase in this case method return type

(cherry picked from commit bde1932a613b16a37843d93082763fc172626550)

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

@@ -31,6 +31,7 @@ import com.intellij.psi.scope.util.PsiScopesUtil;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.util.PsiTypesUtil;
 import com.intellij.psi.util.PsiUtil;
+import com.intellij.psi.util.TypeConversionUtil;
 import com.intellij.util.ArrayUtilRt;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -49,6 +50,8 @@ public class InferenceSession {
   private PsiSubstitutor mySiteSubstitutor;
   private PsiManager myManager;
   private int myConstraintIdx = 0;
+  
+  private boolean myErased = false;
 
   private final InferenceIncorporationPhase myIncorporationPhase = new InferenceIncorporationPhase(this);
 
@@ -186,7 +189,7 @@ public class InferenceSession {
                               @Nullable PsiExpression[] args,
                               @Nullable PsiElement parent,
                               ParameterTypeInferencePolicy policy) {
-    boolean doesNotContainFalseBound = repeatInferencePhases();
+    boolean doesNotContainFalseBound = repeatInferencePhases(parameters == null);
 
     resolveBounds(myInferenceVariables.values(), mySiteSubstitutor, false);
 
@@ -196,7 +199,7 @@ public class InferenceSession {
       for (InferenceVariable inferenceVariable : myInferenceVariables.values()) {
         inferenceVariable.ignoreInstantiation();
       }
-      doesNotContainFalseBound = repeatInferencePhases();
+      doesNotContainFalseBound = repeatInferencePhases(true);
       resolveBounds(myInferenceVariables.values(), mySiteSubstitutor, false);
     }
 
@@ -280,7 +283,7 @@ public class InferenceSession {
           });
         }
         if (targetType != null) {
-          myConstraints.add(new TypeCompatibilityConstraint(GenericsUtil.eliminateWildcards(targetType, false), PsiImplUtil.normalizeWildcardTypeByPosition(returnType, context)));
+          myConstraints.add(new TypeCompatibilityConstraint(myErased ? TypeConversionUtil.erasure(targetType) : GenericsUtil.eliminateWildcards(targetType, false), PsiImplUtil.normalizeWildcardTypeByPosition(returnType, context)));
         }
       }
     }
@@ -434,15 +437,16 @@ public class InferenceSession {
     return dependencies != null ? !dependencies.isEmpty() : isProper;
   }
 
-  private boolean repeatInferencePhases() {
+  private boolean repeatInferencePhases(boolean incorporate) {
     do {
       if (!reduceConstraints()) {
         //inference error occurred
         return false;
       }
-      myIncorporationPhase.incorporate();
-
-    } while (!myIncorporationPhase.isFullyIncorporated() || myConstraintIdx < myConstraints.size());
+      if (incorporate) {
+        myIncorporationPhase.incorporate();
+      }
+    } while (incorporate && !myIncorporationPhase.isFullyIncorporated() || myConstraintIdx < myConstraints.size());
 
     return true;
   }
@@ -473,7 +477,7 @@ public class InferenceSession {
           final List<PsiType> eqBounds = inferenceVariable.getBounds(InferenceBound.EQ);
           final List<PsiType> lowerBounds = inferenceVariable.getBounds(InferenceBound.LOWER);
           final List<PsiType> upperBounds = inferenceVariable.getBounds(InferenceBound.UPPER);
-          if (/*eqBounds.contains(null) || lowerBounds.contains(null) || */upperBounds.contains(null)) {
+          if (myErased && eqBounds.contains(null) || /*lowerBounds.contains(null) || */upperBounds.contains(null)) {
             inferenceVariable.setInstantiation(null);
             continue;
           }
@@ -664,7 +668,7 @@ public class InferenceSession {
       additionalConstraints.removeAll(subset);
 
       myConstraints.addAll(subset);
-      if (!repeatInferencePhases()) {
+      if (!repeatInferencePhases(true)) {
         return false;
       }
 
@@ -676,4 +680,8 @@ public class InferenceSession {
     }
     return true;
   }
+
+  public void setErased() {
+    myErased = true;
+  }
 }

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

@@ -19,6 +19,7 @@ import com.intellij.psi.*;
 import com.intellij.psi.impl.source.resolve.graphInference.InferenceBound;
 import com.intellij.psi.impl.source.resolve.graphInference.InferenceSession;
 import com.intellij.psi.impl.source.resolve.graphInference.InferenceVariable;
+import com.intellij.psi.util.PsiUtil;
 import com.intellij.psi.util.TypeConversionUtil;
 
 import java.util.List;
@@ -86,6 +87,11 @@ public class SubtypingConstraint implements ConstraintFormula {
           final PsiSubstitutor tSubstitutor = TResult.getSubstitutor();
           final PsiSubstitutor sSubstitutor = SClass != null ? TypeConversionUtil.getClassSubstitutor(CClass, SClass, SResult.getSubstitutor()) : null;
           if (sSubstitutor != null) {
+            //18.2.2 Type Compatibility Constraints
+            if (PsiUtil.isRawSubstitutor(CClass, sSubstitutor)) {
+              session.setErased();
+              return true;
+            }
             for (PsiTypeParameter parameter : CClass.getTypeParameters()) {
               final PsiType tSubstituted = tSubstitutor.substitute(parameter);
               final PsiType sSubstituted = sSubstitutor.substituteWithBoundsPromotion(parameter);