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

KJS: check hashCode property only for objects to avoid extra boxing for primitive values

Browse Source 
Also in Nashorn everything has hashCode including primitive types,
so the result can be different at Nashorn and at other engines.
This commit is contained in:
Zalim Bashorov
2017-04-21 16:41:18 +03:00
parent 678d2e7c21
commit fb1c4320b6
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/dataClasses/hashCode/boolean.kt
Vendored
+3 -1
View File
@@ -1,5 +1,7 @@
data class A(val a: Boolean) data class A(val a: Boolean)
fun box() : String { fun box() : String {
return if( A(true).hashCode()==1 && A(false).hashCode()==0 ) "OK" else "fail" if (A(true).hashCode() != 1) return "fail1"
if (A(false).hashCode() !=0) return "fail2"
return "OK"
} }
js/js.libraries/src/js/core.js
+5 -5
View File
@@ -38,14 +38,14 @@ Kotlin.hashCode = function (obj) {
if (obj == null) { if (obj == null) {
return 0; return 0;
} }
if ("function" === typeof obj.hashCode) {
return obj.hashCode();
}
var objType = typeof obj; var objType = typeof obj;
if ("object" === objType || "function" === objType) { if ("object" === objType) {
return "function" === typeof obj.hashCode ? obj.hashCode() : getObjectHashCode(obj);
}
if ("function" === objType) {
return getObjectHashCode(obj); return getObjectHashCode(obj);
} }
else if ("number" === objType) { if ("number" === objType) {
return numberHashCode(obj); return numberHashCode(obj);
} }
if ("boolean" === objType) { if ("boolean" === objType) {