From ae801c4b45c9225672f61d9f1e20350d2427a0a7 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Fri, 7 Sep 2018 23:23:01 +0300 Subject: [PATCH] [JS IR BE] (quick fix) define coroutine related *H.kt files earlier to fix overriding actual implementations by empty expected versions --- .../jetbrains/kotlin/js/test/BasicIrBoxTest.kt | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicIrBoxTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicIrBoxTest.kt index a6f3e8405c3..bc67ae62b9a 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicIrBoxTest.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicIrBoxTest.kt @@ -16,6 +16,15 @@ import org.jetbrains.kotlin.test.TargetBackend import java.io.File private val runtimeSources = listOfKtFilesFrom( + // TODO: share more coroutine code between JS BEs + // TODO: don't generate code for external declarations, until that: + // it's important now than *H.kt files at the start since we generate code for them + // and actual versions just will override them later. + "libraries/stdlib/coroutines-experimental/src/kotlin/coroutines/experimental/CoroutinesExperimentalH.kt", + "libraries/stdlib/coroutines-experimental/src/kotlin/coroutines/experimental/CoroutinesIntrinsicsExperimentalH.kt", + "libraries/stdlib/coroutines-experimental/src/kotlin/coroutines/experimental/SequenceBuilder.kt", + "libraries/stdlib/coroutines-experimental/src/kotlin/coroutines/experimental/Coroutines.kt", + "core/builtins/src/kotlin", "libraries/stdlib/common/src", "libraries/stdlib/src/kotlin/", @@ -69,12 +78,6 @@ private val runtimeSources = listOfKtFilesFrom( // Full version is defined in stdlib // This file is useful for smaller subset of runtime sources "libraries/stdlib/js/irRuntime/rangeExtensions.kt" -) + listOfKtFilesFrom( - // TODO share more coroutine code between JS BEs - "libraries/stdlib/coroutines-experimental/src/kotlin/coroutines/experimental/SequenceBuilder.kt", - "libraries/stdlib/coroutines-experimental/src/kotlin/coroutines/experimental/Coroutines.kt", - "libraries/stdlib/coroutines-experimental/src/kotlin/coroutines/experimental/CoroutinesExperimentalH.kt", - "libraries/stdlib/coroutines-experimental/src/kotlin/coroutines/experimental/CoroutinesIntrinsicsExperimentalH.kt" ) // Smaller set of sources missing a big part of stdlib