diff --git a/analysis/decompiled/light-classes-for-decompiled/src/org/jetbrains/kotlin/analysis/decompiled/light/classes/origin/KotlinDeclarationInCompiledFileSearcher.kt b/analysis/decompiled/light-classes-for-decompiled/src/org/jetbrains/kotlin/analysis/decompiled/light/classes/origin/KotlinDeclarationInCompiledFileSearcher.kt
index 4eaa14e2dd9..068aba89ff9 100644
--- a/analysis/decompiled/light-classes-for-decompiled/src/org/jetbrains/kotlin/analysis/decompiled/light/classes/origin/KotlinDeclarationInCompiledFileSearcher.kt
+++ b/analysis/decompiled/light-classes-for-decompiled/src/org/jetbrains/kotlin/analysis/decompiled/light/classes/origin/KotlinDeclarationInCompiledFileSearcher.kt
@@ -13,11 +13,9 @@ import org.jetbrains.kotlin.analysis.decompiler.psi.file.KtClsFile
 import org.jetbrains.kotlin.asJava.syntheticAccessors
 import org.jetbrains.kotlin.load.kotlin.MemberSignature
 import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.psi.KtClassOrObject
-import org.jetbrains.kotlin.psi.KtDeclaration
-import org.jetbrains.kotlin.psi.KtNamedFunction
-import org.jetbrains.kotlin.psi.allConstructors
+import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.type.MapPsiToAsmDesc
+import org.jetbrains.kotlin.utils.addToStdlib.safeAs
 
 abstract class KotlinDeclarationInCompiledFileSearcher {
     abstract fun findDeclarationInCompiledFile(file: KtClsFile, member: PsiMember, signature: MemberSignature): KtDeclaration?
@@ -46,23 +44,23 @@ abstract class KotlinDeclarationInCompiledFileSearcher {
         member: PsiMember,
         memberName: String,
     ): KtDeclaration? {
-        val topClassOrObject = file.declarations.singleOrNull() as? KtClassOrObject
-        val container: KtClassOrObject = if (relativeClassName.isEmpty())
-            topClassOrObject
+        val classOrFile: KtDeclarationContainer = file.declarations.singleOrNull() as? KtClassOrObject ?: file
+        val container: KtDeclarationContainer = if (relativeClassName.isEmpty())
+            classOrFile
         else {
-            relativeClassName.fold(topClassOrObject) { classOrObject, name ->
-                classOrObject?.declarations?.singleOrNull { it.name == name.asString() } as? KtClassOrObject
+            relativeClassName.fold(classOrFile) { declaration: KtDeclarationContainer?, name: Name ->
+                declaration?.declarations?.singleOrNull() { it is KtClassOrObject && it.name == name.asString() } as? KtClassOrObject
             }
         } ?: return null
 
         if (member is PsiMethod && member.isConstructor) {
-            return container.takeIf { it.name == memberName }?.allConstructors?.singleOrNull()
+            return container.safeAs<KtClassOrObject>()?.takeIf { it.name == memberName }?.allConstructors?.singleOrNull()
         }
 
         val declarations = container.declarations
         return when (member) {
             is PsiMethod -> {
-                val names = member.syntheticAccessors.map(Name::asString) + memberName
+                val names = member.syntheticAccessors(withoutOverrideCheck = true).map(Name::asString) + memberName
                 declarations.singleOrNull { it.name in names }
             }
 
diff --git a/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/lightClassUtils.kt b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/lightClassUtils.kt
index 303e59f7ae3..a3befb9241b 100644
--- a/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/lightClassUtils.kt
+++ b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/lightClassUtils.kt
@@ -269,7 +269,11 @@ private val PsiMethod.canBeSetter: Boolean
     get() = JvmAbi.isSetterName(name) && parameters.size == 1 && returnTypeElement?.textMatches("void") != false
 
 private val PsiMethod.probablyCanHaveSyntheticAccessors: Boolean
-    get() = canHaveOverride && !hasTypeParameters() && !isFinalProperty
+    get() = probablyCanHaveSyntheticAccessors()
+
+private fun PsiMethod.probablyCanHaveSyntheticAccessors(withoutOverrideCheck: Boolean = false): Boolean {
+    return (withoutOverrideCheck || canHaveOverride) && !hasTypeParameters() && !isFinalProperty
+}
 
 private val PsiMethod.getterName: Name? get() = propertyNameByGetMethodName(Name.identifier(name))
 private val PsiMethod.setterNames: Collection<Name>? get() = propertyNamesBySetMethodName(Name.identifier(name)).takeIf { it.isNotEmpty() }
@@ -284,16 +288,17 @@ private val PsiMethod.isFinalProperty: Boolean
 
 private val PsiMethod.isTopLevelDeclaration: Boolean get() = unwrapped?.isTopLevelKtOrJavaMember() == true
 
-val PsiMethod.syntheticAccessors: Collection<Name>
-    get() {
-        if (!probablyCanHaveSyntheticAccessors) return emptyList()
+val PsiMethod.syntheticAccessors: Collection<Name> get() = syntheticAccessors()
 
-        return when {
-            canBeGetter -> listOfNotNull(getterName)
-            canBeSetter -> setterNames.orEmpty()
-            else -> emptyList()
-        }
+fun PsiMethod.syntheticAccessors(withoutOverrideCheck: Boolean = false): Collection<Name> {
+    if (!probablyCanHaveSyntheticAccessors(withoutOverrideCheck)) return emptyList()
+
+    return when {
+        canBeGetter -> listOfNotNull(getterName)
+        canBeSetter -> setterNames.orEmpty()
+        else -> emptyList()
     }
+}
 
 val PsiMethod.canHaveSyntheticAccessors: Boolean get() = probablyCanHaveSyntheticAccessors && (canBeGetter || canBeSetter)