Merge remote-tracking branch 'aosp/upstream-master' into merge

Conflicts:
	.idea/modules.xml
	build/scripts/tests.gant

Change-Id: I9a1fe25b61f1004e0f62419a5f64e1452644b784

1 files changed, 8 insertions, 1 deletions

diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceVariable.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceVariable.java
index a606e90e8a98..a19961f4c3a9 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceVariable.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceVariable.java
@@ -26,6 +26,8 @@ import java.util.*;
  * User: anna
  */
 public class InferenceVariable extends LightTypeParameter {
+  private PsiElement myContext;
+
   public PsiTypeParameter getParameter() {
     return getDelegate();
   }
@@ -35,8 +37,9 @@ public class InferenceVariable extends LightTypeParameter {
 
   private PsiType myInstantiation = PsiType.NULL;
 
-  InferenceVariable(PsiTypeParameter parameter) {
+  InferenceVariable(PsiElement context, PsiTypeParameter parameter) {
     super(parameter);
+    myContext = context;
   }
 
   public PsiType getInstantiation() {
@@ -129,4 +132,8 @@ public class InferenceVariable extends LightTypeParameter {
   public String toString() {
     return getDelegate().toString();
   }
+
+  public PsiElement getCallContext() {
+    return myContext;
+  }
 }