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

Fix DataFlowValue creation for Transient/Script receivers

Browse Source
This commit is contained in:
Denis Zharkov
2015-08-27 16:05:54 +03:00
parent b471767e03
commit 9f8f0e9d37
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DataFlowValueFactory.java
+1 -2
View File
@@ -118,8 +118,7 @@ public class DataFlowValueFactory {
if (receiverValue instanceof TransientReceiver || receiverValue instanceof ScriptReceiver) { if (receiverValue instanceof TransientReceiver || receiverValue instanceof ScriptReceiver) {
// SCRIPT: smartcasts data flow // SCRIPT: smartcasts data flow
JetType type = receiverValue.getType(); JetType type = receiverValue.getType();
boolean nullable = type.isMarkedNullable() || TypeUtils.hasNullableSuperType(type); return new DataFlowValue(receiverValue, type, true, false, getImmanentNullability(type));
return new DataFlowValue(receiverValue, type, nullable, false, Nullability.NOT_NULL);
} }
else if (receiverValue instanceof ClassReceiver || receiverValue instanceof ExtensionReceiver) { else if (receiverValue instanceof ClassReceiver || receiverValue instanceof ExtensionReceiver) {
return createDataFlowValue((ThisReceiver) receiverValue); return createDataFlowValue((ThisReceiver) receiverValue);