diff --git a/compiler/frontend/src/org/jetbrains/kotlin/contracts/ESDataFlowValue.kt b/compiler/frontend/src/org/jetbrains/kotlin/contracts/ESDataFlowValue.kt
index 421047c1476..0fedde0791f 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/contracts/ESDataFlowValue.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/contracts/ESDataFlowValue.kt
@@ -23,7 +23,22 @@ import org.jetbrains.kotlin.descriptors.ValueDescriptor
 import org.jetbrains.kotlin.psi.KtLambdaExpression
 import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowValue
 
-class ESDataFlowValue(descriptor: ValueDescriptor, val dataFlowValue: DataFlowValue) : ESVariable(descriptor)
+class ESDataFlowValue(descriptor: ValueDescriptor, val dataFlowValue: DataFlowValue) : ESVariable(descriptor) {
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as ESDataFlowValue
+
+        if (dataFlowValue != other.dataFlowValue) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        return dataFlowValue.hashCode()
+    }
+}
 
 class ESLambda(val lambda: KtLambdaExpression) : ESValue(null) {
     override fun <T> accept(visitor: ESExpressionVisitor<T>): T {
diff --git a/compiler/testData/diagnostics/tests/smartCasts/smartcastOnSameFieldOfDifferentInstances.kt b/compiler/testData/diagnostics/tests/smartCasts/smartcastOnSameFieldOfDifferentInstances.kt
index 7433c144bd5..68f01c6bdbf 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/smartcastOnSameFieldOfDifferentInstances.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/smartcastOnSameFieldOfDifferentInstances.kt
@@ -5,7 +5,7 @@ class A(val x: String?) {
     fun foo(other: A) {
         when {
             x == null && other.x == null -> "1"
-            <!DEBUG_INFO_SMARTCAST!>x<!>.length > 0 -> "2"
+            x<!UNSAFE_CALL!>.<!>length > 0 -> "2"
         }
     }
 }
\ No newline at end of file