From d87d0cceae449f7174f218208e936ea7f722ec0d Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 13 Jan 2021 17:11:40 +0100 Subject: [PATCH] JVM IR: report all sources as outputs for .kotlin_module file This fixes some tests for LV=1.5 in KotlinJpsBuildTest, KotlinJpsBuildTestIncremental, IncrementalJvmJpsTestGenerated, IncrementalCacheVersionChangedTestGenerated. #KT-42069 Fixed --- .../src/org/jetbrains/kotlin/codegen/ClassFileFactory.java | 2 +- .../src/org/jetbrains/kotlin/backend/jvm/JvmIrCodegenFactory.kt | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java index f6fe43879ad..b8b156c1ca2 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java @@ -264,7 +264,7 @@ public class ClassFileFactory implements OutputFileCollection { return new MultifileClassCodegenImpl(state, files, facadeFqName); } - private void registerSourceFiles(Collection files) { + public void registerSourceFiles(@NotNull Collection files) { sourceFiles.addAll(toIoFilesIgnoringNonPhysical(files)); } diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmIrCodegenFactory.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmIrCodegenFactory.kt index ec2fea20048..862507de227 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmIrCodegenFactory.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmIrCodegenFactory.kt @@ -177,6 +177,8 @@ class JvmIrCodegenFactory(private val phaseConfig: PhaseConfig) : CodegenFactory context.typeMapper.mapType(context.referenceClass(descriptor).defaultType) } + context.state.factory.registerSourceFiles(irModuleFragment.files.map(context.psiSourceManager::getKtFile)) + JvmLower(context).lower(irModuleFragment) for (generateMultifileFacade in listOf(true, false)) {