From 5e007f9179811180d636d80da794b4bff4dc6fa1 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Mon, 10 Jan 2022 23:12:42 +0100 Subject: [PATCH] IR: fix FileClassInfo generation from source-based entry assuming that it's name contains path, symmetrical to the PSI variant --- .../jetbrains/kotlin/backend/jvm/lower/FileClassLowering.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/FileClassLowering.kt b/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/FileClassLowering.kt index 2afbdfbd750..a763801dba0 100644 --- a/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/FileClassLowering.kt +++ b/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/FileClassLowering.kt @@ -39,6 +39,7 @@ import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.resolve.inline.INLINE_ONLY_ANNOTATION_FQ_NAME import org.jetbrains.kotlin.resolve.jvm.JvmClassName +import java.io.File internal val fileClassPhase = makeIrModulePhase( ::FileClassLowering, @@ -151,7 +152,7 @@ fun IrFile.getFileClassInfo(): JvmFileClassInfo = is PsiIrFileEntry -> JvmFileClassUtil.getFileClassInfoNoResolve(fileEntry.psiFile as KtFile) is NaiveSourceBasedFileEntryImpl -> - JvmSimpleFileClassInfo(PackagePartClassUtils.getPackagePartFqName(fqName, fileEntry.name), false) + JvmSimpleFileClassInfo(PackagePartClassUtils.getPackagePartFqName(fqName, File(fileEntry.name).name), false) else -> error("unknown kind of file entry: $fileEntry") }