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

[FIR mangler] Handle parent type aliases properly

Browse Source 
NB: Normally parent class-like must be a class,
but in expect-actual situation it may appear to be an actual type alias.
This commit is contained in:
Mikhail Glukhikh
2020-06-04 10:52:44 +03:00
parent 5603afbd20
commit 8a456f578d
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmMangleComputer.kt
+7 -3
View File
@@ -79,9 +79,13 @@ open class FirJvmMangleComputer(
else -> return else -> return
} }
if (parentClassId != null && !parentClassId.isLocal) { if (parentClassId != null && !parentClassId.isLocal) {
val parentClass = session.firSymbolProvider.getClassLikeSymbolByFqName(parentClassId)?.fir as? FirRegularClass val parentClassLike = session.firSymbolProvider.getClassLikeSymbolByFqName(parentClassId)?.fir
?: throw AssertionError("Attempt to find parent for probably-local declaration!") ?: throw AssertionError("Attempt to find parent ($parentClassId) for probably-local declaration!")
parentClass.accept(this@FirJvmMangleComputer, false) if (parentClassLike is FirRegularClass || parentClassLike is FirTypeAlias) {
parentClassLike.accept(this@FirJvmMangleComputer, false)
} else {
throw AssertionError("Strange class-like declaration: ${parentClassLike.render()}")
}
} else if (parentClassId == null && !parentPackageFqName.isRoot) { } else if (parentClassId == null && !parentPackageFqName.isRoot) {
builder.appendName(parentPackageFqName.asString()) builder.appendName(parentPackageFqName.asString())
} }