azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Hack due to KT-678 was removed

Browse Source
This commit is contained in:
Mikhail Glukhikh
2016-08-15 19:01:24 +03:00
parent cbcef67d82
commit dbff2be6fa
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java
-6
View File
@@ -1095,12 +1095,6 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
public boolean accept(@Nullable WritableSlice<?, ?> slice, Object key) { public boolean accept(@Nullable WritableSlice<?, ?> slice, Object key) {
// the type of the right (and sometimes left) expression isn't 'Any?' actually // the type of the right (and sometimes left) expression isn't 'Any?' actually
if ((key == right || key == left) && slice == EXPRESSION_TYPE_INFO) return false; 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; return true;
} }
}, true); }, true);