From dbff2be6fa2bdb2585f5c22e9fa1e73352a6ed68 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Mon, 15 Aug 2016 19:01:24 +0300 Subject: [PATCH] Hack due to KT-678 was removed --- .../types/expressions/BasicExpressionTypingVisitor.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java index bedfbdf935e..17c5fd50ea3 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java @@ -1095,12 +1095,6 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { public boolean accept(@Nullable WritableSlice slice, Object key) { // the type of the right (and sometimes left) expression isn't 'Any?' actually if ((key == right || key == left) && slice == EXPRESSION_TYPE_INFO) return false; - - // a hack due to KT-678 - // without this line an smartcast is reported on the receiver (if it was previously checked for not-null) - // with not-null check the resolution result changes from 'fun Any?.equals' to 'equals' member - if (key == left && slice == SMARTCAST) return false; - return true; } }, true);