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

IR: fix FileClassInfo generation from source-based entry

Browse Source 
assuming that it's name contains path, symmetrical to the PSI variant
This commit is contained in:
Ilya Chernikov
2022-01-10 23:12:42 +01:00
committed by teamcity
parent 5abdf93d3b
commit 5e007f9179
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/FileClassLowering.kt
+2 -1
View File
@@ -39,6 +39,7 @@ import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.resolve.inline.INLINE_ONLY_ANNOTATION_FQ_NAME import org.jetbrains.kotlin.resolve.inline.INLINE_ONLY_ANNOTATION_FQ_NAME
import org.jetbrains.kotlin.resolve.jvm.JvmClassName import org.jetbrains.kotlin.resolve.jvm.JvmClassName
import java.io.File
internal val fileClassPhase = makeIrModulePhase( internal val fileClassPhase = makeIrModulePhase(
::FileClassLowering, ::FileClassLowering,
@@ -151,7 +152,7 @@ fun IrFile.getFileClassInfo(): JvmFileClassInfo =
is PsiIrFileEntry -> is PsiIrFileEntry ->
JvmFileClassUtil.getFileClassInfoNoResolve(fileEntry.psiFile as KtFile) JvmFileClassUtil.getFileClassInfoNoResolve(fileEntry.psiFile as KtFile)
is NaiveSourceBasedFileEntryImpl -> is NaiveSourceBasedFileEntryImpl ->
JvmSimpleFileClassInfo(PackagePartClassUtils.getPackagePartFqName(fqName, fileEntry.name), false) JvmSimpleFileClassInfo(PackagePartClassUtils.getPackagePartFqName(fqName, File(fileEntry.name).name), false)
else -> else ->
error("unknown kind of file entry: $fileEntry") error("unknown kind of file entry: $fileEntry")
} }