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

It's ok to have no subject expression

Browse Source
This commit is contained in:
Dmitry Petrov
2017-10-20 17:39:34 +03:00
parent 7bc89b8871
commit f6d446da47
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/PatternMatchingTypingVisitor.kt
+4 -12
View File
@@ -155,11 +155,9 @@ class PatternMatchingTypingVisitor internal constructor(facade: ExpressionTyping
override fun createDataFlowValue(contextAfterSubject: ExpressionTypingContext, builtIns: KotlinBuiltIns) = override fun createDataFlowValue(contextAfterSubject: ExpressionTypingContext, builtIns: KotlinBuiltIns) =
DataFlowValue.nullValue(builtIns) DataFlowValue.nullValue(builtIns)
override fun makeValueArgument(): ValueArgument = override fun makeValueArgument(): ValueArgument? = null
error("Should not be called for Subject.None")
override val valueExpression: KtExpression override val valueExpression: KtExpression? get() = null
get() = error("Should not be called for Subject.None")
} }
@@ -533,17 +531,11 @@ class PatternMatchingTypingVisitor internal constructor(facade: ExpressionTyping
override fun visitWhenConditionWithExpression(condition: KtWhenConditionWithExpression) { override fun visitWhenConditionWithExpression(condition: KtWhenConditionWithExpression) {
val expression = condition.expression ?: return val expression = condition.expression ?: return
val subjectValueExpression = subject.valueExpression
val basicDataFlowInfo = checkTypeForExpressionCondition(context, expression, subject.type, subject is Subject.None, subject.dataFlowValue) val basicDataFlowInfo = checkTypeForExpressionCondition(context, expression, subject.type, subject is Subject.None, subject.dataFlowValue)
val moduleDescriptor = DescriptorUtils.getContainingModule(context.scope.ownerDescriptor) val moduleDescriptor = DescriptorUtils.getContainingModule(context.scope.ownerDescriptor)
newDataFlowInfo = if (subjectValueExpression != null) { val dataFlowInfoFromES = components.effectSystem.getDataFlowInfoWhenEquals(subject.valueExpression, expression, context.trace, moduleDescriptor)
val dataFlowInfoFromES = components.effectSystem.getDataFlowInfoWhenEquals(subject.valueExpression, expression, context.trace, moduleDescriptor) newDataFlowInfo = basicDataFlowInfo.and(dataFlowInfoFromES)
basicDataFlowInfo.and(dataFlowInfoFromES)
}
else {
basicDataFlowInfo
}
} }
override fun visitKtElement(element: KtElement) { override fun visitKtElement(element: KtElement) {