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

AA: use simple name of local type as JVM internal name

Browse Source 
Otherwise, e.g., if a local type is within an anonymous object, full
class id will include that anonymous object too, resulting in invalid
type signature for PsiType.

^KT-59533 Fixed
This commit is contained in:
Jinseong Jeon
2023-06-21 15:20:17 -07:00
committed by Ilya Kirillov
parent 2d178e5273
commit a93bc60655
8 changed files with 59 additions and 15 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/FirJvmTypeMapper.kt
+8 -2
View File
@@ -82,7 +82,9 @@ class FirJvmTypeMapper(val session: FirSession) : FirSessionComponent {
override fun getClassInternalName(typeConstructor: TypeConstructorMarker): String {
require(typeConstructor is ConeClassLikeLookupTag)
return typeConstructor.classId.asString().replace(".", "$").replace("/", ".")
val classId = typeConstructor.classId
val name = if (classId.isLocal) safeShortClassName(classId) else classId.asString()
return name.replace(".", "$").replace("/", ".")
}
override fun getScriptInternalName(typeConstructor: TypeConstructorMarker): String =
@@ -230,7 +232,11 @@ class FirJvmTypeMapper(val session: FirSession) : FirSessionComponent {
val result = runUnless(classId.isLocal) {
classId.asSingleFqName().toUnsafe().let { JavaToKotlinClassMap.mapKotlinToJava(it)?.shortClassName?.asString() }
}
return result ?: SpecialNames.safeIdentifier(classId.shortClassName).identifier
return result ?: safeShortClassName(classId)
}
private fun safeShortClassName(classId: ClassId): String {
return SpecialNames.safeIdentifier(classId.shortClassName).identifier
}
}