From 8d3271cc6821e9e18d7b10d015c9967a6f8a30f8 Mon Sep 17 00:00:00 2001
From: Dmitriy Novozhilov <dmitriy.novozhilov@jetbrains.com>
Date: Mon, 28 Jan 2019 18:57:45 +0300
Subject: [PATCH] Refactor `if` expressions resolving

Context without expected type became redundant after synthetic
  call resolving was added for inference of `if` expression type

`isStatement` flag removed, because it was effectively unused
---
 .../ControlStructureTypingVisitor.java        | 24 +++++++------------
 .../ExpressionTypingVisitorForStatements.java |  2 +-
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingVisitor.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingVisitor.java
index 212ccd3f53d..be932fcb7f5 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingVisitor.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingVisitor.java
@@ -80,14 +80,7 @@ public class ControlStructureTypingVisitor extends ExpressionTypingVisitor {
 
 
     @Override
-    public KotlinTypeInfo visitIfExpression(@NotNull KtIfExpression expression, ExpressionTypingContext context) {
-        return visitIfExpression(expression, context, false);
-    }
-
-    public KotlinTypeInfo visitIfExpression(KtIfExpression ifExpression, ExpressionTypingContext contextWithExpectedType, boolean isStatement) {
-        components.dataFlowAnalyzer.recordExpectedType(contextWithExpectedType.trace, ifExpression, contextWithExpectedType.expectedType);
-
-        ExpressionTypingContext context = contextWithExpectedType.replaceExpectedType(NO_EXPECTED_TYPE);
+    public KotlinTypeInfo visitIfExpression(@NotNull KtIfExpression ifExpression, ExpressionTypingContext context) {
         KtExpression condition = ifExpression.getCondition();
         DataFlowInfo conditionDataFlowInfo = checkCondition(condition, context);
         boolean loopBreakContinuePossibleInCondition = condition != null && containsJumpOutOfLoop(condition, context);
@@ -103,7 +96,7 @@ public class ControlStructureTypingVisitor extends ExpressionTypingVisitor {
         if (elseBranch == null) {
             if (thenBranch != null) {
                 KotlinTypeInfo result = getTypeInfoWhenOnlyOneBranchIsPresent(
-                        thenBranch, thenScope, thenInfo, elseInfo, contextWithExpectedType, ifExpression);
+                        thenBranch, thenScope, thenInfo, elseInfo, context, ifExpression);
                 // If jump was possible, take condition check info as the jump info
                 return result.getJumpOutPossible()
                        ? result.replaceJumpOutPossible(true).replaceJumpFlowInfo(conditionDataFlowInfo)
@@ -113,7 +106,7 @@ public class ControlStructureTypingVisitor extends ExpressionTypingVisitor {
         }
         if (thenBranch == null) {
             return getTypeInfoWhenOnlyOneBranchIsPresent(
-                    elseBranch, elseScope, elseInfo, thenInfo, contextWithExpectedType, ifExpression);
+                    elseBranch, elseScope, elseInfo, thenInfo, context, ifExpression);
         }
         KtPsiFactory psiFactory = KtPsiFactoryKt.KtPsiFactory(ifExpression, false);
         KtBlockExpression thenBlock = psiFactory.wrapInABlockWrapper(thenBranch);
@@ -124,17 +117,16 @@ public class ControlStructureTypingVisitor extends ExpressionTypingVisitor {
         ResolvedCall<FunctionDescriptor> resolvedCall = components.controlStructureTypingUtils.resolveSpecialConstructionAsCall(
                 callForIf, ResolveConstruct.IF, Lists.newArrayList("thenBranch", "elseBranch"),
                 Lists.newArrayList(false, false),
-                contextWithExpectedType, dataFlowInfoForArguments);
+                context, dataFlowInfoForArguments);
 
-        return processBranches(
-                ifExpression, contextWithExpectedType, context, conditionDataFlowInfo,
+        return processIfBranches(
+                ifExpression, context, conditionDataFlowInfo,
                 loopBreakContinuePossibleInCondition, elseBranch, thenBranch, resolvedCall);
     }
 
     @NotNull
-    private KotlinTypeInfo processBranches(
+    private KotlinTypeInfo processIfBranches(
             KtIfExpression ifExpression,
-            ExpressionTypingContext contextWithExpectedType,
             ExpressionTypingContext context,
             DataFlowInfo conditionDataFlowInfo,
             boolean loopBreakContinuePossibleInCondition,
@@ -206,7 +198,7 @@ public class ControlStructureTypingVisitor extends ExpressionTypingVisitor {
 
         // If break or continue was possible, take condition check info as the jump info
         return TypeInfoFactoryKt.createTypeInfo(
-                components.dataFlowAnalyzer.checkType(resultType, ifExpression, contextWithExpectedType),
+                components.dataFlowAnalyzer.checkType(resultType, ifExpression, context),
                 resultDataFlowInfo, loopBreakContinuePossible,
                 loopBreakContinuePossibleInCondition ? context.dataFlowInfo : conditionDataFlowInfo);
     }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorForStatements.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorForStatements.java
index eabcfc017de..bcd7f89c85e 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorForStatements.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorForStatements.java
@@ -403,7 +403,7 @@ public class ExpressionTypingVisitorForStatements extends ExpressionTypingVisito
 
     @Override
     public KotlinTypeInfo visitIfExpression(@NotNull KtIfExpression expression, ExpressionTypingContext context) {
-        return controlStructures.visitIfExpression(expression, context, true);
+        return controlStructures.visitIfExpression(expression, context);
     }
 
     @Override