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

Fix Double and Float equality/hashCode in data classes

Browse Source 
#KT-5818 Fixed
This commit is contained in:
Alexander Udalov
2014-10-16 19:09:43 +04:00
parent f632a34959
commit 1edaf43051
6 changed files with 100 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/AsmUtil.java
+16 -17
View File
@@ -486,29 +486,28 @@ public class AsmUtil {
v.xor(Type.INT_TYPE);
}
@NotNull
public static StackValue genEqualsForExpressionsOnStack(
InstructionAdapter v,
IElementType opToken,
Type leftType,
Type rightType
@NotNull InstructionAdapter v,
@NotNull IElementType opToken,
@NotNull Type leftType,
@NotNull Type rightType
) {
if ((isNumberPrimitive(leftType) || leftType.getSort() == Type.BOOLEAN) && leftType == rightType) {
if (isPrimitive(leftType) && leftType == rightType) {
return StackValue.cmp(opToken, leftType);
}
else {
if (opToken == JetTokens.EQEQEQ || opToken == JetTokens.EXCLEQEQEQ) {
return StackValue.cmp(opToken, leftType);
}
else {
v.invokestatic("kotlin/jvm/internal/Intrinsics", "areEqual", "(Ljava/lang/Object;Ljava/lang/Object;)Z", false);
if (opToken == JetTokens.EXCLEQ || opToken == JetTokens.EXCLEQEQEQ) {
genInvertBoolean(v);
}
return StackValue.onStack(Type.BOOLEAN_TYPE);
}
if (opToken == JetTokens.EQEQEQ || opToken == JetTokens.EXCLEQEQEQ) {
return StackValue.cmp(opToken, leftType);
}
v.invokestatic("kotlin/jvm/internal/Intrinsics", "areEqual", "(Ljava/lang/Object;Ljava/lang/Object;)Z", false);
if (opToken == JetTokens.EXCLEQ || opToken == JetTokens.EXCLEQEQEQ) {
genInvertBoolean(v);
}
return StackValue.onStack(Type.BOOLEAN_TYPE);
}
public static void genIncrement(Type expectedType, int myDelta, InstructionAdapter v) {
compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
+11 -3
View File
@@ -645,15 +645,23 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
}
else {
iv.invokestatic("java/util/Arrays", "equals",
"([" + elementType.getDescriptor() + "[" + elementType.getDescriptor() + ")Z", false);
"(" + asmType.getDescriptor() + asmType.getDescriptor() + ")Z", false);
}
iv.ifeq(ne);
}
else if (asmType.getSort() == Type.FLOAT) {
iv.invokestatic("java/lang/Float", "compare", "(FF)I", false);
iv.ifne(ne);
}
else if (asmType.getSort() == Type.DOUBLE) {
iv.invokestatic("java/lang/Double", "compare", "(DD)I", false);
iv.ifne(ne);
}
else {
StackValue value = genEqualsForExpressionsOnStack(iv, JetTokens.EQEQ, asmType, asmType);
value.put(Type.BOOLEAN_TYPE, iv);
iv.ifeq(ne);
}
iv.ifeq(ne);
}
iv.mark(eq);
compiler/backend/src/org/jetbrains/jet/codegen/StackValue.java
+1 -1
View File
@@ -517,7 +517,7 @@ public abstract class StackValue {
opcode = jumpIfFalse ? IFGT : IFLE;
}
else {
throw new UnsupportedOperationException("don't know how to generate this condjump");
throw new UnsupportedOperationException("Don't know how to generate this condJump: " + opToken);
}
if (operandType == Type.FLOAT_TYPE || operandType == Type.DOUBLE_TYPE) {
if (opToken == JetTokens.GT || opToken == JetTokens.GTEQ) {
compiler/testData/codegen/boxWithStdlib/dataClasses/doubleParam.kt
+30
View File
@@ -0,0 +1,30 @@
import java.util.HashSet
val NAN = java.lang.Double.NaN
data class A(val x: Double)
fun box(): String {
if (A(+0.0) == A(-0.0)) return "Fail: +0.0 == -0.0"
if (A(+0.0).hashCode() == A(-0.0).hashCode()) return "Fail: hash(+0.0) == hash(-0.0)"
if (A(NAN) != A(NAN)) return "Fail: NaN != NaN"
if (A(NAN).hashCode() != A(NAN).hashCode()) return "Fail: hash(NaN) != hash(NaN)"
val s = HashSet<A>()
for (times in 1..5) {
s.add(A(3.14))
s.add(A(+0.0))
s.add(A(-0.0))
s.add(A(-2.72))
s.add(A(NAN))
}
if (A(3.14) !in s) return "Fail: 3.14 not found"
if (A(+0.0) !in s) return "Fail: +0.0 not found"
if (A(-0.0) !in s) return "Fail: -0.0 not found"
if (A(-2.72) !in s) return "Fail: -2.72 not found"
if (A(NAN) !in s) return "Fail: NaN not found"
return if (s.size == 5) "OK" else "Fail $s"
}
compiler/testData/codegen/boxWithStdlib/dataClasses/floatParam.kt
+30
View File
@@ -0,0 +1,30 @@
import java.util.HashSet
val NAN = java.lang.Float.NaN
data class A(val x: Float)
fun box(): String {
if (A(+0f) == A(-0f)) return "Fail: +0 == -0"
if (A(+0f).hashCode() == A(-0f).hashCode()) return "Fail: hash(+0) == hash(-0)"
if (A(NAN) != A(NAN)) return "Fail: NaN != NaN"
if (A(NAN).hashCode() != A(NAN).hashCode()) return "Fail: hash(NaN) != hash(NaN)"
val s = HashSet<A>()
for (times in 1..5) {
s.add(A(3.14f))
s.add(A(+0f))
s.add(A(-0f))
s.add(A(-2.72f))
s.add(A(NAN))
}
if (A(3.14f) !in s) return "Fail: 3.14 not found"
if (A(+0f) !in s) return "Fail: +0 not found"
if (A(-0f) !in s) return "Fail: -0 not found"
if (A(-2.72f) !in s) return "Fail: -2.72 not found"
if (A(NAN) !in s) return "Fail: NaN not found"
return if (s.size == 5) "OK" else "Fail $s"
}
compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java
+12
View File
@@ -766,6 +766,18 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
doTestWithStdlib(fileName);
}
@TestMetadata("doubleParam.kt")
public void testDoubleParam() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/doubleParam.kt");
doTestWithStdlib(fileName);
}
@TestMetadata("floatParam.kt")
public void testFloatParam() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/floatParam.kt");
doTestWithStdlib(fileName);
}
@TestMetadata("genericParam.kt")
public void testGenericParam() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/genericParam.kt");