From d5638c75539bb394d83250da4d98da9360cbb5e6 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Mon, 16 Feb 2015 18:58:39 +0100 Subject: [PATCH] new inference: already calculated substitutor should be used during fresh variables creation --- .../impl/source/resolve/graphInference/InferenceSession.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceSession.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceSession.java index fcf0f710d62d..90fe82d20b46 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceSession.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceSession.java @@ -806,7 +806,7 @@ public class InferenceSession { for (int i = 0; i < freshParameters.length; i++) { PsiTypeParameter parameter = freshParameters[i]; final InferenceVariable var = vars.get(i); - final PsiType lub = getLowerBound(var, PsiSubstitutor.EMPTY); + final PsiType lub = getLowerBound(var, substitutor); if (lub != PsiType.NULL) { for (PsiClassType upperBoundType : parameter.getExtendsListTypes()) { if (!TypeConversionUtil.isAssignable(upperBoundType, lub)) {