From d1afa215e708d489d89a66a8e374e679a690ce05 Mon Sep 17 00:00:00 2001
From: Svetlana Isakova <svetlana.isakova@jetbrains.com>
Date: Wed, 30 Jul 2014 13:29:37 +0400
Subject: [PATCH] Removed ExpressionTypingContext.containingDeclaration  it's
 always scope.getContainingDeclaration()

---
 .../jet/lang/resolve/calls/CallExpressionResolver.java |  2 +-
 .../types/expressions/ExpressionTypingContext.java     | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallExpressionResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallExpressionResolver.java
index 4186332c8d3..cee060dd5b8 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallExpressionResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallExpressionResolver.java
@@ -143,7 +143,7 @@ public class CallExpressionResolver {
 
         ClassDescriptor classObject = ((ClassDescriptor) classifier).getClassObjectDescriptor();
         assert classObject != null : "This check should be done only for classes with class objects: " + classifier;
-        DeclarationDescriptor from = context.containingDeclaration;
+        DeclarationDescriptor from = context.scope.getContainingDeclaration();
         if (!Visibilities.isVisible(classObject, from)) {
             context.trace.report(INVISIBLE_MEMBER.on(expression, classObject, classObject.getVisibility(), from));
         }
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingContext.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingContext.java
index af7b0f45ab8..771adf42246 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingContext.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingContext.java
@@ -17,7 +17,6 @@
 package org.jetbrains.jet.lang.types.expressions;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
 import org.jetbrains.jet.lang.resolve.BindingTrace;
 import org.jetbrains.jet.lang.resolve.calls.CallResolverExtension;
 import org.jetbrains.jet.lang.resolve.calls.autocasts.DataFlowInfo;
@@ -47,7 +46,7 @@ public class ExpressionTypingContext extends ResolutionContext<ExpressionTypingC
     @NotNull
     public static ExpressionTypingContext newContext(@NotNull ResolutionContext context) {
         return new ExpressionTypingContext(
-                context.trace, context.scope, context.scope.getContainingDeclaration(), context.dataFlowInfo, context.expectedType,
+                context.trace, context.scope, context.dataFlowInfo, context.expectedType,
                 context.contextDependency, context.resolutionResultsCache, context.callResolverExtension, context.isAnnotationContext,
                 context.collectAllCandidates
         );
@@ -65,17 +64,15 @@ public class ExpressionTypingContext extends ResolutionContext<ExpressionTypingC
             boolean isAnnotationContext
     ) {
         return new ExpressionTypingContext(
-                trace, scope, scope.getContainingDeclaration(), dataFlowInfo, expectedType, contextDependency,
+                trace, scope, dataFlowInfo, expectedType, contextDependency,
                 resolutionResultsCache, callResolverExtension, isAnnotationContext, false);
     }
 
-    public final DeclarationDescriptor containingDeclaration;
     private CompileTimeConstantChecker compileTimeConstantChecker;
 
     private ExpressionTypingContext(
             @NotNull BindingTrace trace,
             @NotNull JetScope scope,
-            @NotNull DeclarationDescriptor containingDeclaration,
             @NotNull DataFlowInfo dataFlowInfo,
             @NotNull JetType expectedType,
             @NotNull ContextDependency contextDependency,
@@ -86,7 +83,6 @@ public class ExpressionTypingContext extends ResolutionContext<ExpressionTypingC
     ) {
         super(trace, scope, expectedType, dataFlowInfo, contextDependency, resolutionResultsCache, callResolverExtension,
               isAnnotationContext, collectAllCandidates);
-        this.containingDeclaration = containingDeclaration;
     }
 
     @Override
@@ -99,7 +95,7 @@ public class ExpressionTypingContext extends ResolutionContext<ExpressionTypingC
             @NotNull ResolutionResultsCache resolutionResultsCache,
             boolean collectAllCandidates
     ) {
-        return new ExpressionTypingContext(trace, scope, containingDeclaration, dataFlowInfo,
+        return new ExpressionTypingContext(trace, scope, dataFlowInfo,
                                            expectedType, contextDependency, resolutionResultsCache, callResolverExtension,
                                            isAnnotationContext, collectAllCandidates);
     }