azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIR] Fix order of supertype scopes for supertypes of companion object

Browse Source 
^KT-54645 Fixed
This commit is contained in:
Dmitriy Novozhilov
2022-10-24 15:14:36 +03:00
committed by Space Team
parent d54503e66c
commit f441151eab
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSupertypesResolution.kt
+1 -1
View File
@@ -200,7 +200,7 @@ private fun createOtherScopesForNestedClassesOrCompanion(
klass, klass,
lookupInterfaces = false, deep = true, substituteTypes = true, useSiteSession = session, lookupInterfaces = false, deep = true, substituteTypes = true, useSiteSession = session,
supertypeSupplier = supertypeComputationSession.supertypesSupplier supertypeSupplier = supertypeComputationSession.supertypesSupplier
).asReversed().mapNotNullTo(this) { ).mapNotNullTo(this) {
it.lookupTag.getNestedClassifierScope(session, scopeSession) it.lookupTag.getNestedClassifierScope(session, scopeSession)
?.wrapNestedClassifierScopeWithSubstitutionForSuperType(it, session) ?.wrapNestedClassifierScopeWithSubstitutionForSuperType(it, session)
} }
compiler/testData/codegen/box/companion/kt54645.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// TARGET_BACKEND: JVM_IR // TARGET_BACKEND: JVM_IR
// IGNORE_BACKEND_FIR: JVM_IR
// ISSUE: KT-54645 // ISSUE: KT-54645
abstract class Base { abstract class Base {