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

[FIR] Transform all qualified access nodes with smartcasts

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2019-08-29 13:14:58 +03:00
parent c1a8344b45
commit c2602fda1f
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirBodyResolveTransformer.kt
+15 -16
View File
@@ -203,7 +203,7 @@ open class FirBodyResolveTransformer(
data: Any?
): CompositeTransformResult<FirStatement> {
val result = when (val callee = qualifiedAccessExpression.calleeReference) {
var result = when (val callee = qualifiedAccessExpression.calleeReference) {
is FirExplicitThisReference -> {
val labelName = callee.labelName
val implicitReceiver = implicitReceiverStack[labelName]
@@ -241,33 +241,32 @@ open class FirBodyResolveTransformer(
val transformedCallee = callResolver.resolveVariableAccessAndSelectCandidate(qualifiedAccessExpression, file)
// NB: here we can get raw expression because of dropped qualifiers (see transform callee),
// so candidate existence must be checked before calling completion
val result = if (transformedCallee is FirQualifiedAccessExpression && transformedCallee.candidate() != null) {
if (transformedCallee is FirQualifiedAccessExpression && transformedCallee.candidate() != null) {
callCompleter.completeCall(transformedCallee, data as? FirTypeRef)
} else {
transformedCallee
}
if (result is FirQualifiedAccessExpression) {
dataFlowAnalyzer.getTypeUsingSmartcastInfo(result)?.let { typesFromSmartCast ->
val allTypes = typesFromSmartCast.toMutableList().also {
it += result.resultType.coneTypeUnsafe<ConeKotlinType>()
}
val intersectedType = ConeTypeIntersector.intersectTypes(inferenceComponents.ctx as ConeInferenceContext, allTypes)
// TODO: add check that intersectedType is not equal to original type
FirExpressionWithSmartcastImpl(result, typesFromSmartCast).also {
it.resultType = FirResolvedTypeRefImpl(result.psi, intersectedType, result.resultType.annotations)
}
} ?: result
} else {
result
}
}
}
if (result is FirQualifiedAccessExpression) {
result = transformQualifiedAccessUsingSmartcastInfo(result)
dataFlowAnalyzer.exitQualifiedAccessExpression(result)
}
return result.compose()
}
private fun transformQualifiedAccessUsingSmartcastInfo(qualifiedAccessExpression: FirQualifiedAccessExpression): FirQualifiedAccessExpression {
val typesFromSmartCast = dataFlowAnalyzer.getTypeUsingSmartcastInfo(qualifiedAccessExpression) ?: return qualifiedAccessExpression
val allTypes = typesFromSmartCast.toMutableList().also {
it += qualifiedAccessExpression.resultType.coneTypeUnsafe<ConeKotlinType>()
}
val intersectedType = ConeTypeIntersector.intersectTypes(inferenceComponents.ctx as ConeInferenceContext, allTypes)
// TODO: add check that intersectedType is not equal to original type
return FirExpressionWithSmartcastImpl(qualifiedAccessExpression, typesFromSmartCast).also {
it.resultType = FirResolvedTypeRefImpl(qualifiedAccessExpression.resultType.psi, intersectedType, qualifiedAccessExpression.resultType.annotations)
}
}
override fun transformVariableAssignment(
variableAssignment: FirVariableAssignment,
data: Any?