[FIR] Fix some warnings

This commit is contained in:
Dmitriy Novozhilov
2021-04-21 13:38:58 +03:00
committed by TeamCityServer
parent 234ab3b35d
commit d4162f876f
2 changed files with 3 additions and 10 deletions
@@ -151,7 +151,7 @@ class JavaOverrideChecker internal constructor(
val baseParameterTypes = listOfNotNull(receiverTypeRef) + baseDeclaration.valueParameters.map { it.returnTypeRef }
if (overrideCandidate.valueParameters.size != baseParameterTypes.size) return false
val substitutor = buildTypeParametersSubstitutorIfCompatible(overrideCandidate, baseDeclaration) ?: return false
val substitutor = buildTypeParametersSubstitutorIfCompatible(overrideCandidate, baseDeclaration)
return overrideCandidate.valueParameters.zip(baseParameterTypes).all { (paramFromJava, baseType) ->
isEqualTypes(paramFromJava.returnTypeRef, baseType, substitutor)
}
@@ -142,22 +142,15 @@ class FirControlFlowStatementsResolveTransformer(transformer: FirBodyResolveTran
dataFlowAnalyzer.exitTryMainBlock()
tryExpression.transformCatches(this, ResolutionMode.ContextDependent)
var callCompleted = false
var callCompleted: Boolean
@Suppress("NAME_SHADOWING")
var result = syntheticCallGenerator.generateCalleeForTryExpression(tryExpression, resolutionContext)?.let {
var result = syntheticCallGenerator.generateCalleeForTryExpression(tryExpression, resolutionContext).let {
val expectedTypeRef = data.expectedType
val completionResult = callCompleter.completeCall(it, expectedTypeRef)
callCompleted = completionResult.callCompleted
completionResult.result
} ?: run {
tryExpression.resultType = buildErrorTypeRef {
diagnostic = ConeSimpleDiagnostic("Can't resolve try expression", DiagnosticKind.InferenceError)
}
callCompleted = true
tryExpression
}
result = if (result.finallyBlock != null) {
result.also { dataFlowAnalyzer.enterFinallyBlock() }
.transformFinallyBlock(transformer, ResolutionMode.ContextIndependent)