From fff954ed3f5a1de9120712406a9282dee3f48164 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Mon, 15 Jul 2019 14:09:41 +0300
Subject: [PATCH] FIR: skip extra non-valid groups during candidate resolve

---
 .../org/jetbrains/kotlin/fir/resolve/calls/CallResolver.kt    | 3 ++-
 .../resolve/expresssions/invoke/propertyFromParameter.txt     | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CallResolver.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CallResolver.kt
index f7bffdcdfce..5c53dfc3cba 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CallResolver.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CallResolver.kt
@@ -394,7 +394,8 @@ abstract class TowerDataConsumer {
     fun skipGroup(group: Int, resultCollector: CandidateCollector): Boolean {
         if (resultCollector.isSuccess() && stopGroup == Int.MAX_VALUE) {
             stopGroup = group
-        } else if (group > stopGroup) return true
+        }
+        if (group >= stopGroup) return true
         return false
     }
 }
diff --git a/compiler/fir/resolve/testData/resolve/expresssions/invoke/propertyFromParameter.txt b/compiler/fir/resolve/testData/resolve/expresssions/invoke/propertyFromParameter.txt
index ad2414e1afe..6b3f2ecc410 100644
--- a/compiler/fir/resolve/testData/resolve/expresssions/invoke/propertyFromParameter.txt
+++ b/compiler/fir/resolve/testData/resolve/expresssions/invoke/propertyFromParameter.txt
@@ -4,7 +4,7 @@ FILE: propertyFromParameter.kt
             super<R|kotlin/Any|>()
         }
 
-        public final val name: <ERROR TYPE REF: cycle> = R|<local>/name|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/String|>|()
-            public get(): <ERROR TYPE REF: cycle>
+        public final val name: R|kotlin/String| = R|<local>/name|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/String|>|()
+            public get(): R|kotlin/String|
 
     }