From dd0e919f8e359f4d17539ef15318f71513d99885 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Tue, 11 Jun 2013 12:59:14 +0400 Subject: [PATCH] Deferred types may delegate equals() to their actual implementatinos --- .../src/org/jetbrains/jet/lang/types/DeferredType.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/DeferredType.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/DeferredType.java index 36562d8dbbb..f43b5a98f96 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/DeferredType.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/DeferredType.java @@ -96,13 +96,7 @@ public class DeferredType implements JetType { @Override public boolean equals(Object obj) { - if (this == obj) return true; - JetType actualType = getActualType(); - if (actualType == obj) return true; - - if (!(obj instanceof JetType)) return false; - - return TypeUtils.equalTypes(actualType, (JetType) obj); + return getActualType().equals(obj); } @Override