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) {