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

[NI] Use right DFI for arguments smart-casts.

Browse Source
This commit is contained in:
Stanislav Erokhin
2017-05-22 17:29:45 +03:00
committed by Mikhail Zarechenskiy
parent 30f7396803
commit 58f73bd82a
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/NewCallArguments.kt
+2 -1
View File
@@ -159,7 +159,8 @@ internal fun createSimplePSICallArgument(
val baseType = onlyResolvedCall?.currentReturnType ?: typeInfo.type?.unwrap() ?: return null val baseType = onlyResolvedCall?.currentReturnType ?: typeInfo.type?.unwrap() ?: return null
val preparedType = prepareArgumentTypeRegardingCaptureTypes(baseType) ?: baseType val preparedType = prepareArgumentTypeRegardingCaptureTypes(baseType) ?: baseType
val receiverToCast = context.transformToReceiverWithSmartCastInfo( // we should use DFI after this argument, because there can be some useful smartcast. Popular case: if branches.
val receiverToCast = context.replaceDataFlowInfo(typeInfo.dataFlowInfo).transformToReceiverWithSmartCastInfo(
ExpressionReceiver.create(ktExpression, baseType, context.trace.bindingContext) ExpressionReceiver.create(ktExpression, baseType, context.trace.bindingContext)
).let { ).let {
ReceiverValueWithSmartCastInfo(it.receiverValue.replaceType(preparedType), it.possibleTypes, it.isStable) ReceiverValueWithSmartCastInfo(it.receiverValue.replaceType(preparedType), it.possibleTypes, it.isStable)