From 07a44960544b5e8178657442bf13a9ff98b9765f Mon Sep 17 00:00:00 2001
From: Mikhail Zarechenskiy <mikhail.zarechenskiy@jetbrains.com>
Date: Tue, 18 Jul 2017 14:14:02 +0300
Subject: [PATCH] [NI] Resolve lambda even if there is contradiction in CS

To avoid exceptions about non-recorded lambda
---
 .../kotlin/resolve/calls/components/KotlinCallCompleter.kt      | 2 --
 1 file changed, 2 deletions(-)

diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/KotlinCallCompleter.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/KotlinCallCompleter.kt
index 7f7764394aa..492365e6146 100644
--- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/KotlinCallCompleter.kt
+++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/KotlinCallCompleter.kt
@@ -181,8 +181,6 @@ class KotlinCallCompleter(
     // true if it is the end (happy or not)
     // every step we fix type variable or analyzeLambda
     private fun SimpleKotlinResolutionCandidate.oneStepToEndOrLambda(c: Context, resolutionCallbacks: KotlinResolutionCallbacks): Boolean {
-        if (c.hasContradiction) return true
-
         val lambda = c.lambdaArguments.find { canWeAnalyzeIt(c, it) }
         if (lambda != null) {
             analyzeLambda(c, resolutionCallbacks, lambda)