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

[FE] Add isLocal name to ClassId constructor calls where it needed

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2023-09-19 13:08:42 +03:00
committed by Space Team
parent adaf8ae46a
commit 9e5ee3afa0
39 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/JvmBackendClassResolver.kt
+1 -1
View File
@@ -53,5 +53,5 @@ val Type.classId: ClassId
val packageFQN = if (lastDotIndex >= 0) FqName(className.substring(0, lastDotIndex)) else FqName.ROOT
val classRelativeNameWithDollars = if (lastDotIndex >= 0) className.substring(lastDotIndex + 1) else className
val classFQN = FqName(classRelativeNameWithDollars.replace('$', '.'))
return ClassId(packageFQN, classFQN, false)
return ClassId(packageFQN, classFQN, isLocal = false)
}
compiler/backend/src/org/jetbrains/kotlin/codegen/serialization/JvmCodegenStringTable.kt
+1 -1
View File
@@ -26,7 +26,7 @@ class JvmCodegenStringTable @JvmOverloads constructor(
}
else -> {
val fqName = FqName(typeMapper.mapClass(descriptor).internalName.replace('/', '.'))
ClassId(fqName.parent(), FqName.topLevel(fqName.shortName()), true)
ClassId(fqName.parent(), FqName.topLevel(fqName.shortName()), isLocal = true)
}
}
compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.kt
+1 -1
View File
@@ -1366,7 +1366,7 @@ class KotlinTypeMapper @JvmOverloads constructor(
return JvmClassName.byClassId(ownerClassId).internalName
}
private val FAKE_CLASS_ID_FOR_BUILTINS = ClassId(FqName("kotlin.jvm.internal"), FqName("Intrinsics.Kotlin"), false)
private val FAKE_CLASS_ID_FOR_BUILTINS = ClassId(FqName("kotlin.jvm.internal"), FqName("Intrinsics.Kotlin"), isLocal = false)
private fun getPackageMemberContainingClassesInfo(descriptor: DescriptorWithContainerSource): ContainingClassesInfo? {
val containingDeclaration = descriptor.containingDeclaration