-
Notifications
You must be signed in to change notification settings - Fork 37
Kotlin-compose: do not access isD8 global #138
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| diff --git a/benchmarks/multiplatform/benchmarks/src/wasmJsMain/kotlin/main.wasmJs.kt b/benchmarks/multiplatform/benchmarks/src/wasmJsMain/kotlin/main.wasmJs.kt | ||
| index d796d88975..f2c9e48eda 100644 | ||
| --- a/benchmarks/multiplatform/benchmarks/src/wasmJsMain/kotlin/main.wasmJs.kt | ||
| +++ b/benchmarks/multiplatform/benchmarks/src/wasmJsMain/kotlin/main.wasmJs.kt | ||
| @@ -8,11 +8,6 @@ import kotlin.js.Promise | ||
| val jsOne = 1.toJsNumber() | ||
|
|
||
| fun main(args: Array<String>) { | ||
| - if (isD8env().toBoolean()) { | ||
| - mainD8(args) | ||
| - } else { | ||
| - mainBrowser() | ||
| - } | ||
| } | ||
|
|
||
| fun mainBrowser() { | ||
| @@ -37,15 +32,6 @@ fun mainBrowser() { | ||
| } | ||
| } | ||
|
|
||
| - | ||
| -// Currently, the initialization can't be adjusted to avoid calling the fun main, but | ||
| -// we don't want use the default fun main, because Jetstream3 requires running the workloads separately / independently of each other. | ||
| -// Also, they require that a benchmark completes before the function exists, which is not possible with if they just call fun main. | ||
| -// Therefore, they'll rely on fun customLaunch, which returns a Promise (can be awaited for). | ||
| -fun mainD8(args: Array<String>) { | ||
| - println("mainD8 is intentionally doing nothing. Read the comments in main.wasmJs.kt") | ||
| -} | ||
| - | ||
| private val basicConfigForD8 = Config( | ||
| // Using only SIMPLE mode, because VSYNC_EMULATION calls delay(...), | ||
| // which is implemented via setTimeout on web targets. | ||
| @@ -85,6 +71,3 @@ fun d8BenchmarksRunner(args: String): Promise<JsAny?> { | ||
| jsOne | ||
| } | ||
| } | ||
| - | ||
| -private fun isD8env(): JsBoolean = | ||
| - js("typeof isD8 !== 'undefined'") |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.