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

JVM IR: report all sources as outputs for .kotlin_module file

Browse Source 
This fixes some tests for LV=1.5 in KotlinJpsBuildTest,
KotlinJpsBuildTestIncremental, IncrementalJvmJpsTestGenerated,
IncrementalCacheVersionChangedTestGenerated.

 #KT-42069 Fixed
This commit is contained in:
Alexander Udalov
2021-01-13 17:11:40 +01:00
committed by Dmitriy Novozhilov
parent f3393eae1b
commit d87d0cceae
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java
+1 -1
View File
@@ -264,7 +264,7 @@ public class ClassFileFactory implements OutputFileCollection {
return new MultifileClassCodegenImpl(state, files, facadeFqName); return new MultifileClassCodegenImpl(state, files, facadeFqName);
} }
private void registerSourceFiles(Collection<KtFile> files) { public void registerSourceFiles(@NotNull Collection<KtFile> files) {
sourceFiles.addAll(toIoFilesIgnoringNonPhysical(files)); sourceFiles.addAll(toIoFilesIgnoringNonPhysical(files));
} }
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmIrCodegenFactory.kt
+2
View File
@@ -177,6 +177,8 @@ class JvmIrCodegenFactory(private val phaseConfig: PhaseConfig) : CodegenFactory
context.typeMapper.mapType(context.referenceClass(descriptor).defaultType) context.typeMapper.mapType(context.referenceClass(descriptor).defaultType)
} }
context.state.factory.registerSourceFiles(irModuleFragment.files.map(context.psiSourceManager::getKtFile))
JvmLower(context).lower(irModuleFragment) JvmLower(context).lower(irModuleFragment)
for (generateMultifileFacade in listOf(true, false)) { for (generateMultifileFacade in listOf(true, false)) {