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

[JS IR BE] Fix runtime compareTo(Number, Long)

Browse Source
This commit is contained in:
Svyatoslav Kuzmich
2018-10-02 17:44:34 +03:00
parent 44d56cb278
commit c7bde6a5e6
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/ieee754/differentTypesComparison.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// IGNORE_BACKEND: NATIVE // IGNORE_BACKEND: NATIVE
// IGNORE_BACKEND: JS_IR
fun box(): String { fun box(): String {
if (0.toByte().compareTo(-0.0) != 1) return "fail 1.1" if (0.toByte().compareTo(-0.0) != 1) return "fail 1.1"
if (0.toByte().compareTo(-0.0F) != 1) return "fail 1.2" if (0.toByte().compareTo(-0.0F) != 1) return "fail 1.2"
libraries/stdlib/js/irRuntime/compareTo.kt
+11 -11
View File
@@ -8,19 +8,19 @@ package kotlin.js
// Adopted from misc.js // Adopted from misc.js
fun compareTo(a: dynamic, b: dynamic): Int { fun compareTo(a: dynamic, b: dynamic): Int = when (typeOf(a)) {
var typeA = typeOf(a) "number" -> when {
if (typeA == "number") { typeOf(b) == "number" ->
if (typeOf(b) == "number") { doubleCompareTo(a, b)
return doubleCompareTo(a, b) b is Long ->
} doubleCompareTo(a, b.toDouble())
return primitiveCompareTo(a, b) else ->
} primitiveCompareTo(a, b)
if (typeA == "string" || typeA == "boolean") {
return primitiveCompareTo(a, b)
} }
return compareToDoNotIntrinsicify(a, b) "string", "boolean" -> primitiveCompareTo(a, b)
else -> compareToDoNotIntrinsicify(a, b)
} }
@DoNotIntrinsify @DoNotIntrinsify