From fc9a1968833174acfadaa1aa5b1435e8524da76c Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Mon, 23 Sep 2013 19:06:15 +0400
Subject: [PATCH] new inference: ignore proper types in mutual eq constraints
 generation

---
 .../resolve/graphInference/InferenceIncorporationPhase.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceIncorporationPhase.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceIncorporationPhase.java
index e1c3d63d8b15..9fa36e565ae7 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceIncorporationPhase.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceIncorporationPhase.java
@@ -175,9 +175,11 @@ public class InferenceIncorporationPhase {
     for (int i = 0; i < eqBounds.size(); i++) {
       PsiType sBound= eqBounds.get(i);
       if (sBound == null) continue;
+      final boolean properType = mySession.isProperType(sBound);
       for (int j = i + 1; j < eqBounds.size(); j++) {
         final PsiType tBound = eqBounds.get(j);
         if (tBound == null) continue;
+        if (properType && mySession.isProperType(tBound)) continue;
         addConstraint(new TypeEqualityConstraint(tBound, sBound));
       }
     }