diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/FirKotlinToJvmBytecodeCompiler.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/FirKotlinToJvmBytecodeCompiler.kt index 3fb27549467..b96d211a213 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/FirKotlinToJvmBytecodeCompiler.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/FirKotlinToJvmBytecodeCompiler.kt @@ -210,7 +210,7 @@ object FirKotlinToJvmBytecodeCompiler { val rootModuleName = module.getModuleName() val libraryList = createLibraryListForJvm(rootModuleName, moduleConfiguration, module.getFriendPaths()) val sessionsWithSources = prepareJvmSessions( - ktFiles, moduleConfiguration, projectEnvironment, Name.identifier(rootModuleName), + ktFiles, moduleConfiguration, projectEnvironment, Name.special("<$rootModuleName>"), extensionRegistrars, librariesScope, libraryList, isCommonSource = { it.isCommonSource == true }, fileBelongsToModule = { file, moduleName -> file.hmppModuleName == moduleName }, diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/pipeline/compilerPipeline.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/pipeline/compilerPipeline.kt index f1a132a0ca7..0cce9a57f24 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/pipeline/compilerPipeline.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/pipeline/compilerPipeline.kt @@ -280,7 +280,7 @@ fun compileModuleToAnalyzedFir( // TODO: handle friends paths val libraryList = createLibraryListForJvm(rootModuleName, moduleConfiguration, friendPaths = emptyList()) val sessionWithSources = prepareJvmSessions( - allSources, moduleConfiguration, projectEnvironment, Name.identifier(rootModuleName), + allSources, moduleConfiguration, projectEnvironment, Name.special("<$rootModuleName>"), extensionRegistrars, librariesScope, libraryList, isCommonSource = input.groupedSources.isCommonSourceForLt, fileBelongsToModule = input.groupedSources.fileBelongsToModuleForLt, diff --git a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/ScriptJvmCompilerImpls.kt b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/ScriptJvmCompilerImpls.kt index e6e47e4a55e..6886fa79566 100644 --- a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/ScriptJvmCompilerImpls.kt +++ b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/ScriptJvmCompilerImpls.kt @@ -357,7 +357,7 @@ private fun doCompileWithK2( friendPaths = emptyList() ) val session = prepareJvmSessions( - sourceFiles, kotlinCompilerConfiguration, projectEnvironment, Name.identifier(rootModuleName), extensionRegistrars, + sourceFiles, kotlinCompilerConfiguration, projectEnvironment, Name.special("<$rootModuleName>"), extensionRegistrars, librariesScope, libraryList, isCommonSourceForPsi, fileBelongsToModuleForPsi, createProviderAndScopeForIncrementalCompilation = { files -> createContextForIncrementalCompilation(