From 6b4e5bc2f0d6b576d3309731f8385cb49fccf9fa Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Thu, 9 Jan 2020 18:10:58 +0300
Subject: [PATCH] [FIR] Cleanup code and fix type check in SAM resolution

---
 .../src/org/jetbrains/kotlin/fir/resolve/SamResolution.kt   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/SamResolution.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/SamResolution.kt
index c74fee217f5..7f0fc643afd 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/SamResolution.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/SamResolution.kt
@@ -22,6 +22,7 @@ import org.jetbrains.kotlin.fir.scopes.ProcessorAction
 import org.jetbrains.kotlin.fir.scopes.scope
 import org.jetbrains.kotlin.fir.symbols.CallableId
 import org.jetbrains.kotlin.fir.symbols.StandardClassIds
+import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirVariableSymbol
@@ -144,7 +145,7 @@ class FirSamResolverImpl(
             newTypeParameter.bounds += oldTypeParameter.bounds.mapNotNull { typeRef ->
                 FirResolvedTypeRefImpl(
                     typeRef.source,
-                    substitutor.substituteOrSelf(typeRef.coneTypeSafe<ConeKotlinType>() ?: return@mapNotNull null)
+                    substitutor.substituteOrSelf(typeRef.coneTypeSafe() ?: return@mapNotNull null)
                 )
             }
         }
@@ -250,11 +251,10 @@ private fun FirRegularClass.findSingleAbstractMethodByNames(
     val classUseSiteMemberScope = this.scope(ConeSubstitutor.Empty, session, scopeSession)
 
     for (candidateName in samCandidateNames) {
-        if (classUseSiteMemberScope == null) break
         if (metIncorrectMember) break
 
         classUseSiteMemberScope.processPropertiesByName(candidateName) {
-            if ((it as? FirProperty)?.modality == Modality.ABSTRACT) {
+            if ((it as? FirPropertySymbol)?.fir?.modality == Modality.ABSTRACT) {
                 metIncorrectMember = true
                 ProcessorAction.STOP
             } else {