new inference: skip null subtypes

(cherry picked from commit 837fc3567e628ac753d3e3c19f5c1039465ecf7d)
This commit is contained in:
anna
2013-11-25 16:48:10 +01:00
parent 5f1db87624
commit 45cf19cae3
@@ -50,7 +50,7 @@ public class SubtypingConstraint implements ConstraintFormula {
inferenceVariable.addBound(myT, InferenceBound.UPPER);
return true;
}
if (PsiType.NULL.equals(myS)) return true;
if (PsiType.NULL.equals(myS) || myS == null) return true;
inferenceVariable = session.getInferenceVariable(myT);
if (inferenceVariable != null) {
inferenceVariable.addBound(myS, InferenceBound.LOWER);