From 2725930460adedf2d8f045a4372ab44c6a58e1e5 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Tue, 10 Nov 2020 12:21:53 +0300
Subject: [PATCH] [FIR] Code cleanup in JavaClassUseSiteMemberScope

---
 .../fir/java/scopes/JavaClassUseSiteMemberScope.kt    | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassUseSiteMemberScope.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassUseSiteMemberScope.kt
index 025b8b60d35..0d0f01646ef 100644
--- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassUseSiteMemberScope.kt
+++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassUseSiteMemberScope.kt
@@ -61,7 +61,7 @@ class JavaClassUseSiteMemberScope(
         getterSymbol: FirNamedFunctionSymbol,
         setterSymbol: FirNamedFunctionSymbol?,
         syntheticPropertyName: Name,
-    ): FirAccessorSymbol? {
+    ): FirAccessorSymbol {
         return buildSyntheticProperty {
             session = this@JavaClassUseSiteMemberScope.session
             name = syntheticPropertyName
@@ -117,13 +117,8 @@ class JavaClassUseSiteMemberScope(
                             }
                         }
                     }
-                    val accessorSymbol = generateAccessorSymbol(
-                        getterSymbol!!, setterSymbol, propertyName
-                    )
-                    if (accessorSymbol != null) {
-                        // NB: accessor should not be processed directly unless we find matching property symbol in supertype
-                        overrideCandidates += accessorSymbol
-                    }
+                    val accessorSymbol = generateAccessorSymbol(getterSymbol!!, setterSymbol, propertyName)
+                    overrideCandidates += accessorSymbol
                 }
             }
         }