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

[K2, MPP, JS] Fix a compiler crash on transitive common dependencies

Browse Source 
^KT-57431 Fixed
This commit is contained in:
Ivan Kochurkin
2023-03-21 13:28:02 +01:00
committed by Space Team
parent 4e67d82cd3
commit c14dcfce4f
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/multiplatform/k2/annotations/optionalExpectation.kt
Vendored
+1 -2
View File
@@ -2,9 +2,8 @@
// !OPT_IN: kotlin.ExperimentalMultiplatform // !OPT_IN: kotlin.ExperimentalMultiplatform
// IGNORE_BACKEND: WASM // IGNORE_BACKEND: WASM
// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, NATIVE // IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, NATIVE
// IGNORE_BACKEND_K2: JS_IR
// KT-57181
// IGNORE_BACKEND_K2: NATIVE // IGNORE_BACKEND_K2: NATIVE
// KT-57181
// WITH_STDLIB // WITH_STDLIB
// MODULE: common // MODULE: common
compiler/testData/codegen/box/multiplatform/k2/basic/independentCommonSourceModules.kt
Vendored
-2
View File
@@ -1,7 +1,5 @@
// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6 // IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6
// IGNORE_BACKEND_K2: JS_IR
// !LANGUAGE: +MultiPlatformProjects // !LANGUAGE: +MultiPlatformProjects
// TODO: K2 JS_IR Fail Reason: IrSimpleFunctionPublicSymbolImpl for kotlin/assertArrayEquals|-1961670457646030164[0] is already bound...
// MODULE: common1 // MODULE: common1
// TARGET_PLATFORM: Common // TARGET_PLATFORM: Common
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/impl/ModuleStructureExtractorImpl.kt
+2 -2
View File
@@ -355,10 +355,9 @@ class ModuleStructureExtractorImpl(
directives = moduleDirectives, directives = moduleDirectives,
languageVersionSettings = currentModuleLanguageVersionSettingsBuilder.build() languageVersionSettings = currentModuleLanguageVersionSettingsBuilder.build()
) )
modules += testModule
if (testModule.frontendKind != FrontendKinds.FIR || if (testModule.frontendKind != FrontendKinds.FIR ||
!testModule.languageVersionSettings.supportsFeature(LanguageFeature.MultiPlatformProjects) || !testModule.languageVersionSettings.supportsFeature(LanguageFeature.MultiPlatformProjects) ||
testModule.dependsOnDependencies.isEmpty() modules.isEmpty()
) { ) {
additionalSourceProviders.flatMapTo(filesOfCurrentModule) { additionalSourceProvider -> additionalSourceProviders.flatMapTo(filesOfCurrentModule) { additionalSourceProvider ->
additionalSourceProvider.produceAdditionalFiles( additionalSourceProvider.produceAdditionalFiles(
@@ -371,6 +370,7 @@ class ModuleStructureExtractorImpl(
} }
} }
} }
modules += testModule
firstFileInModule = true firstFileInModule = true
resetModuleCaches() resetModuleCaches()
} }