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

[JS IR BE] (quick fix) define coroutine related *H.kt files earlier to fix overriding actual implementations by empty expected versions

Browse Source
This commit is contained in:
Zalim Bashorov
2018-09-07 23:23:01 +03:00
parent 78131d2e65
commit ae801c4b45
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.tests/test/org/jetbrains/kotlin/js/test/BasicIrBoxTest.kt
+9 -6
View File
@@ -16,6 +16,15 @@ import org.jetbrains.kotlin.test.TargetBackend
import java.io.File import java.io.File
private val runtimeSources = listOfKtFilesFrom( 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", "core/builtins/src/kotlin",
"libraries/stdlib/common/src", "libraries/stdlib/common/src",
"libraries/stdlib/src/kotlin/", "libraries/stdlib/src/kotlin/",
@@ -69,12 +78,6 @@ private val runtimeSources = listOfKtFilesFrom(
// Full version is defined in stdlib // Full version is defined in stdlib
// This file is useful for smaller subset of runtime sources // This file is useful for smaller subset of runtime sources
"libraries/stdlib/js/irRuntime/rangeExtensions.kt" "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 // Smaller set of sources missing a big part of stdlib