KT-16684 hashCode doesn't check data class property value of generic type for null
This commit is contained in:
Dmitry Petrov
@@ -32,13 +32,11 @@ import org.jetbrains.kotlin.resolve.calls.model.ArgumentMatch
|
||||
import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
|
||||
import org.jetbrains.kotlin.resolve.scopes.MemberScope
|
||||
import org.jetbrains.kotlin.types.KotlinType
|
||||
import org.jetbrains.kotlin.types.checker.KotlinTypeChecker
|
||||
import org.jetbrains.kotlin.types.typeUtil.builtIns
|
||||
import org.jetbrains.kotlin.types.upperIfFlexible
|
||||
import org.jetbrains.kotlin.types.TypeUtils
|
||||
import java.lang.Exception
|
||||
|
||||
fun KotlinType.containsNull() =
|
||||
KotlinTypeChecker.DEFAULT.isSubtypeOf(builtIns.nullableNothingType, this.upperIfFlexible())
|
||||
TypeUtils.isNullableType(this)
|
||||
|
||||
fun KtElement.deparenthesize(): KtElement =
|
||||
if (this is KtExpression) KtPsiUtil.safeDeparenthesize(this) else this
|
||||
|
||||
+3
-1
@@ -1 +1,3 @@
|
||||
data class Test1(val x: Int, val y: String, val z: Any)
|
||||
data class Test1(val x: Int, val y: String, val z: Any)
|
||||
|
||||
data class Test2(val x: Any?)
|
||||
@@ -155,3 +155,90 @@ FILE /dataClasses.kt
|
||||
CONST Boolean type=kotlin.Boolean value='false'
|
||||
RETURN type=kotlin.Nothing from='equals(Any?): Boolean'
|
||||
CONST Boolean type=kotlin.Boolean value='true'
|
||||
CLASS CLASS Test2
|
||||
CONSTRUCTOR public constructor Test2(x: kotlin.Any?)
|
||||
BLOCK_BODY
|
||||
DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
|
||||
INSTANCE_INITIALIZER_CALL classDescriptor='Test2'
|
||||
PROPERTY public final val x: kotlin.Any?
|
||||
FIELD PROPERTY_BACKING_FIELD public final val x: kotlin.Any?
|
||||
EXPRESSION_BODY
|
||||
GET_VAR 'value-parameter x: Any?' type=kotlin.Any? origin=INITIALIZE_PROPERTY_FROM_PARAMETER
|
||||
FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): kotlin.Any?
|
||||
BLOCK_BODY
|
||||
RETURN type=kotlin.Nothing from='<get-x>(): Any?'
|
||||
GET_FIELD 'x: Any?' type=kotlin.Any? origin=null
|
||||
receiver: GET_VAR '<receiver: Test2>' type=Test2 origin=null
|
||||
FUN GENERATED_DATA_CLASS_MEMBER public final operator fun component1(): kotlin.Any?
|
||||
BLOCK_BODY
|
||||
RETURN type=kotlin.Nothing from='component1(): Any?'
|
||||
CALL '<get-x>(): Any?' type=kotlin.Any? origin=GET_PROPERTY
|
||||
$this: GET_VAR '<receiver: Test2>' type=Test2 origin=null
|
||||
FUN GENERATED_DATA_CLASS_MEMBER public final fun copy(x: kotlin.Any? = ...): Test2
|
||||
x: EXPRESSION_BODY
|
||||
CALL '<get-x>(): Any?' type=kotlin.Any? origin=GET_PROPERTY
|
||||
$this: GET_VAR '<receiver: Test2>' type=Test2 origin=null
|
||||
BLOCK_BODY
|
||||
RETURN type=kotlin.Nothing from='copy(Any? = ...): Test2'
|
||||
CALL 'constructor Test2(Any?)' type=Test2 origin=null
|
||||
x: GET_VAR 'value-parameter x: Any? = ...' type=kotlin.Any? origin=null
|
||||
FUN GENERATED_DATA_CLASS_MEMBER public open override fun toString(): kotlin.String
|
||||
BLOCK_BODY
|
||||
RETURN type=kotlin.Nothing from='toString(): String'
|
||||
STRING_CONCATENATION type=kotlin.String
|
||||
CONST String type=kotlin.String value='Test2('
|
||||
CONST String type=kotlin.String value='x='
|
||||
CALL '<get-x>(): Any?' type=kotlin.Any? origin=GET_PROPERTY
|
||||
$this: GET_VAR '<receiver: Test2>' type=Test2 origin=null
|
||||
CONST String type=kotlin.String value=')'
|
||||
FUN GENERATED_DATA_CLASS_MEMBER public open override fun hashCode(): kotlin.Int
|
||||
BLOCK_BODY
|
||||
VAR IR_TEMPORARY_VARIABLE var tmp0_result: kotlin.Int
|
||||
CONST Int type=kotlin.Int value='0'
|
||||
SET_VAR 'tmp0_result: Int' type=kotlin.Unit origin=EQ
|
||||
BLOCK type=kotlin.Int origin=null
|
||||
VAR IR_TEMPORARY_VARIABLE val tmp1: kotlin.Any?
|
||||
CALL '<get-x>(): Any?' type=kotlin.Any? origin=GET_PROPERTY
|
||||
$this: GET_VAR '<receiver: Test2>' type=Test2 origin=null
|
||||
WHEN type=kotlin.Int origin=null
|
||||
BRANCH
|
||||
if: CALL 'EQEQ(Any?, Any?): Boolean' type=kotlin.Boolean origin=EQEQ
|
||||
arg0: GET_VAR 'tmp1: Any?' type=kotlin.Any? origin=null
|
||||
arg1: CONST Null type=kotlin.Nothing? value='null'
|
||||
then: CONST Int type=kotlin.Int value='0'
|
||||
BRANCH
|
||||
if: CONST Boolean type=kotlin.Boolean value='true'
|
||||
then: CALL 'hashCode(): Int' type=kotlin.Int origin=null
|
||||
$this: GET_VAR 'tmp1: Any?' type=kotlin.Any? origin=null
|
||||
RETURN type=kotlin.Nothing from='hashCode(): Int'
|
||||
GET_VAR 'tmp0_result: Int' type=kotlin.Int origin=null
|
||||
FUN GENERATED_DATA_CLASS_MEMBER public open override fun equals(other: kotlin.Any?): kotlin.Boolean
|
||||
BLOCK_BODY
|
||||
WHEN type=kotlin.Unit origin=null
|
||||
BRANCH
|
||||
if: CALL 'EQEQEQ(Any?, Any?): Boolean' type=kotlin.Boolean origin=EQEQEQ
|
||||
arg0: GET_VAR '<receiver: Test2>' type=Test2 origin=null
|
||||
arg1: GET_VAR 'value-parameter other: Any?' type=kotlin.Any? origin=null
|
||||
then: RETURN type=kotlin.Nothing from='equals(Any?): Boolean'
|
||||
CONST Boolean type=kotlin.Boolean value='true'
|
||||
WHEN type=kotlin.Unit origin=null
|
||||
BRANCH
|
||||
if: TYPE_OP type=kotlin.Boolean origin=NOT_INSTANCEOF typeOperand=Test2
|
||||
GET_VAR 'value-parameter other: Any?' type=kotlin.Any? origin=null
|
||||
then: RETURN type=kotlin.Nothing from='equals(Any?): Boolean'
|
||||
CONST Boolean type=kotlin.Boolean value='false'
|
||||
VAR IR_TEMPORARY_VARIABLE val tmp0_other_with_cast: Test2
|
||||
TYPE_OP type=Test2 origin=CAST typeOperand=Test2
|
||||
GET_VAR 'value-parameter other: Any?' type=kotlin.Any? origin=null
|
||||
WHEN type=kotlin.Unit origin=null
|
||||
BRANCH
|
||||
if: CALL 'NOT(Boolean): Boolean' type=kotlin.Boolean origin=EXCLEQ
|
||||
arg0: CALL 'EQEQ(Any?, Any?): Boolean' type=kotlin.Boolean origin=EXCLEQ
|
||||
arg0: CALL '<get-x>(): Any?' type=kotlin.Any? origin=GET_PROPERTY
|
||||
$this: GET_VAR '<receiver: Test2>' type=Test2 origin=null
|
||||
arg1: CALL '<get-x>(): Any?' type=kotlin.Any? origin=GET_PROPERTY
|
||||
$this: GET_VAR 'tmp0_other_with_cast: Test2' type=Test2 origin=null
|
||||
then: RETURN type=kotlin.Nothing from='equals(Any?): Boolean'
|
||||
CONST Boolean type=kotlin.Boolean value='false'
|
||||
RETURN type=kotlin.Nothing from='equals(Any?): Boolean'
|
||||
CONST Boolean type=kotlin.Boolean value='true'
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
data class Test1<T>(val x: T)
|
||||
@@ -0,0 +1,89 @@
|
||||
FILE /dataClassesGeneric.kt
|
||||
CLASS CLASS Test1
|
||||
CONSTRUCTOR public constructor Test1<T>(x: T)
|
||||
BLOCK_BODY
|
||||
DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
|
||||
INSTANCE_INITIALIZER_CALL classDescriptor='Test1'
|
||||
PROPERTY public final val x: T
|
||||
FIELD PROPERTY_BACKING_FIELD public final val x: T
|
||||
EXPRESSION_BODY
|
||||
GET_VAR 'value-parameter x: T' type=T origin=INITIALIZE_PROPERTY_FROM_PARAMETER
|
||||
FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): T
|
||||
BLOCK_BODY
|
||||
RETURN type=kotlin.Nothing from='<get-x>(): T'
|
||||
GET_FIELD 'x: T' type=T origin=null
|
||||
receiver: GET_VAR '<receiver: Test1>' type=Test1<T> origin=null
|
||||
FUN GENERATED_DATA_CLASS_MEMBER public final operator fun component1(): T
|
||||
BLOCK_BODY
|
||||
RETURN type=kotlin.Nothing from='component1(): T'
|
||||
CALL '<get-x>(): T' type=T origin=GET_PROPERTY
|
||||
$this: GET_VAR '<receiver: Test1>' type=Test1<T> origin=null
|
||||
FUN GENERATED_DATA_CLASS_MEMBER public final fun copy(x: T = ...): Test1<T>
|
||||
x: EXPRESSION_BODY
|
||||
CALL '<get-x>(): T' type=T origin=GET_PROPERTY
|
||||
$this: GET_VAR '<receiver: Test1>' type=Test1<T> origin=null
|
||||
BLOCK_BODY
|
||||
RETURN type=kotlin.Nothing from='copy(T = ...): Test1<T>'
|
||||
CALL 'constructor Test1(T)' type=Test1<T> origin=null
|
||||
x: GET_VAR 'value-parameter x: T = ...' type=T origin=null
|
||||
FUN GENERATED_DATA_CLASS_MEMBER public open override fun toString(): kotlin.String
|
||||
BLOCK_BODY
|
||||
RETURN type=kotlin.Nothing from='toString(): String'
|
||||
STRING_CONCATENATION type=kotlin.String
|
||||
CONST String type=kotlin.String value='Test1('
|
||||
CONST String type=kotlin.String value='x='
|
||||
CALL '<get-x>(): T' type=T origin=GET_PROPERTY
|
||||
$this: GET_VAR '<receiver: Test1>' type=Test1<T> origin=null
|
||||
CONST String type=kotlin.String value=')'
|
||||
FUN GENERATED_DATA_CLASS_MEMBER public open override fun hashCode(): kotlin.Int
|
||||
BLOCK_BODY
|
||||
VAR IR_TEMPORARY_VARIABLE var tmp0_result: kotlin.Int
|
||||
CONST Int type=kotlin.Int value='0'
|
||||
SET_VAR 'tmp0_result: Int' type=kotlin.Unit origin=EQ
|
||||
BLOCK type=kotlin.Int origin=null
|
||||
VAR IR_TEMPORARY_VARIABLE val tmp1: T
|
||||
CALL '<get-x>(): T' type=T origin=GET_PROPERTY
|
||||
$this: GET_VAR '<receiver: Test1>' type=Test1<T> origin=null
|
||||
WHEN type=kotlin.Int origin=null
|
||||
BRANCH
|
||||
if: CALL 'EQEQ(Any?, Any?): Boolean' type=kotlin.Boolean origin=EQEQ
|
||||
arg0: GET_VAR 'tmp1: T' type=T origin=null
|
||||
arg1: CONST Null type=kotlin.Nothing? value='null'
|
||||
then: CONST Int type=kotlin.Int value='0'
|
||||
BRANCH
|
||||
if: CONST Boolean type=kotlin.Boolean value='true'
|
||||
then: CALL 'hashCode(): Int' type=kotlin.Int origin=null
|
||||
$this: TYPE_OP type=kotlin.Any origin=IMPLICIT_CAST typeOperand=kotlin.Any
|
||||
GET_VAR 'tmp1: T' type=T origin=null
|
||||
RETURN type=kotlin.Nothing from='hashCode(): Int'
|
||||
GET_VAR 'tmp0_result: Int' type=kotlin.Int origin=null
|
||||
FUN GENERATED_DATA_CLASS_MEMBER public open override fun equals(other: kotlin.Any?): kotlin.Boolean
|
||||
BLOCK_BODY
|
||||
WHEN type=kotlin.Unit origin=null
|
||||
BRANCH
|
||||
if: CALL 'EQEQEQ(Any?, Any?): Boolean' type=kotlin.Boolean origin=EQEQEQ
|
||||
arg0: GET_VAR '<receiver: Test1>' type=Test1<T> origin=null
|
||||
arg1: GET_VAR 'value-parameter other: Any?' type=kotlin.Any? origin=null
|
||||
then: RETURN type=kotlin.Nothing from='equals(Any?): Boolean'
|
||||
CONST Boolean type=kotlin.Boolean value='true'
|
||||
WHEN type=kotlin.Unit origin=null
|
||||
BRANCH
|
||||
if: TYPE_OP type=kotlin.Boolean origin=NOT_INSTANCEOF typeOperand=Test1<T>
|
||||
GET_VAR 'value-parameter other: Any?' type=kotlin.Any? origin=null
|
||||
then: RETURN type=kotlin.Nothing from='equals(Any?): Boolean'
|
||||
CONST Boolean type=kotlin.Boolean value='false'
|
||||
VAR IR_TEMPORARY_VARIABLE val tmp0_other_with_cast: Test1<T>
|
||||
TYPE_OP type=Test1<T> origin=CAST typeOperand=Test1<T>
|
||||
GET_VAR 'value-parameter other: Any?' type=kotlin.Any? origin=null
|
||||
WHEN type=kotlin.Unit origin=null
|
||||
BRANCH
|
||||
if: CALL 'NOT(Boolean): Boolean' type=kotlin.Boolean origin=EXCLEQ
|
||||
arg0: CALL 'EQEQ(Any?, Any?): Boolean' type=kotlin.Boolean origin=EXCLEQ
|
||||
arg0: CALL '<get-x>(): T' type=T origin=GET_PROPERTY
|
||||
$this: GET_VAR '<receiver: Test1>' type=Test1<T> origin=null
|
||||
arg1: CALL '<get-x>(): T' type=T origin=GET_PROPERTY
|
||||
$this: GET_VAR 'tmp0_other_with_cast: Test1<T>' type=Test1<T> origin=null
|
||||
then: RETURN type=kotlin.Nothing from='equals(Any?): Boolean'
|
||||
CONST Boolean type=kotlin.Boolean value='false'
|
||||
RETURN type=kotlin.Nothing from='equals(Any?): Boolean'
|
||||
CONST Boolean type=kotlin.Boolean value='true'
|
||||
@@ -74,6 +74,12 @@ public class IrTextTestCaseGenerated extends AbstractIrTextTestCase {
|
||||
doTest(fileName);
|
||||
}
|
||||
|
||||
@TestMetadata("dataClassesGeneric.kt")
|
||||
public void testDataClassesGeneric() throws Exception {
|
||||
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/classes/dataClassesGeneric.kt");
|
||||
doTest(fileName);
|
||||
}
|
||||
|
||||
@TestMetadata("delegatedImplementation.kt")
|
||||
public void testDelegatedImplementation() throws Exception {
|
||||
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/classes/delegatedImplementation.kt");
|
||||
|
||||
Reference in New Issue
Block a user