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

[FIR] Fix typo in FirDataFlowAnalyzer

Browse Source
This commit is contained in:
Oleg Ivanov
2020-08-12 15:00:54 +03:00
parent e3bbc54e85
commit 252eb1ad23
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/FirDataFlowAnalyzer.kt
+1 -1
View File
@@ -835,7 +835,7 @@ abstract class FirDataFlowAnalyzer<FLOW : Flow>(
contractDescriptionVisitingMode = false contractDescriptionVisitingMode = false
} }
fun exitConstExpresion(constExpression: FirConstExpression<*>) { fun exitConstExpression(constExpression: FirConstExpression<*>) {
if (constExpression.resultType is FirResolvedTypeRef && !contractDescriptionVisitingMode) return if (constExpression.resultType is FirResolvedTypeRef && !contractDescriptionVisitingMode) return
graphBuilder.exitConstExpresion(constExpression).mergeIncomingFlow() graphBuilder.exitConstExpresion(constExpression).mergeIncomingFlow()
} }
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt
+2 -2
View File
@@ -702,7 +702,7 @@ open class FirExpressionsResolveTransformer(transformer: FirBodyResolveTransform
if (newConstKind == null) { if (newConstKind == null) {
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")
constExpression.replaceKind(FirConstKind.Int as FirConstKind<T>) constExpression.replaceKind(FirConstKind.Int as FirConstKind<T>)
dataFlowAnalyzer.exitConstExpresion(constExpression as FirConstExpression<*>) dataFlowAnalyzer.exitConstExpression(constExpression as FirConstExpression<*>)
constExpression.resultType = buildErrorTypeRef { constExpression.resultType = buildErrorTypeRef {
source = constExpression.source source = constExpression.source
diagnostic = ConeTypeMismatchError(expectedType, integerLiteralType.getApproximatedType()) diagnostic = ConeTypeMismatchError(expectedType, integerLiteralType.getApproximatedType())
@@ -719,7 +719,7 @@ open class FirExpressionsResolveTransformer(transformer: FirBodyResolveTransform
else -> kind.expectedConeType() else -> kind.expectedConeType()
} }
dataFlowAnalyzer.exitConstExpresion(constExpression as FirConstExpression<*>) dataFlowAnalyzer.exitConstExpression(constExpression as FirConstExpression<*>)
constExpression.resultType = constExpression.resultType.resolvedTypeFromPrototype(type) constExpression.resultType = constExpression.resultType.resolvedTypeFromPrototype(type)
return constExpression.compose() return constExpression.compose()
} }