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

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
@@ -1,5 +1,4 @@
// IGNORE_BACKEND: NATIVE
// IGNORE_BACKEND: JS_IR
fun box(): String {
if (0.toByte().compareTo(-0.0) != 1) return "fail 1.1"
if (0.toByte().compareTo(-0.0F) != 1) return "fail 1.2"
+11 -11
View File
@@ -8,19 +8,19 @@ package kotlin.js
// Adopted from misc.js
fun compareTo(a: dynamic, b: dynamic): Int {
var typeA = typeOf(a)
if (typeA == "number") {
if (typeOf(b) == "number") {
return doubleCompareTo(a, b)
}
return primitiveCompareTo(a, b)
}
if (typeA == "string" || typeA == "boolean") {
return primitiveCompareTo(a, b)
fun compareTo(a: dynamic, b: dynamic): Int = when (typeOf(a)) {
"number" -> when {
typeOf(b) == "number" ->
doubleCompareTo(a, b)
b is Long ->
doubleCompareTo(a, b.toDouble())
else ->
primitiveCompareTo(a, b)
}
return compareToDoNotIntrinsicify(a, b)
"string", "boolean" -> primitiveCompareTo(a, b)
else -> compareToDoNotIntrinsicify(a, b)
}
@DoNotIntrinsify