From bac3191c7ae356ac7ece204323785e85dfaf8840 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Wed, 19 Feb 2014 19:24:06 +0100
Subject: [PATCH] new inferencve: do not apply substitution twice for
 additional constraints

---
 .../resolve/graphInference/InferenceSession.java       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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 ea0ee317ab4c..e4f3c7630194 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
@@ -217,13 +217,13 @@ public class InferenceSession {
     return null;
   }
 
-  private void collectAdditionalConstraints(PsiParameter[] parameters,
-                                            PsiExpression[] args,
-                                            PsiMethod parentMethod,
-                                            Set<ConstraintFormula> additionalConstraints) {
+  private static void collectAdditionalConstraints(PsiParameter[] parameters,
+                                                   PsiExpression[] args,
+                                                   PsiMethod parentMethod,
+                                                   Set<ConstraintFormula> additionalConstraints) {
     for (int i = 0; i < args.length; i++) {
       if (args[i] != null) {
-        PsiType parameterType = getParameterType(parameters, args, i, mySiteSubstitutor);
+        PsiType parameterType = getParameterType(parameters, args, i, PsiSubstitutor.EMPTY);
         if (!isPertinentToApplicability(args[i], parentMethod)) {
           additionalConstraints.add(new ExpressionCompatibilityConstraint(args[i], parameterType));
         }