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

[FIR] Fix some warnings

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaOverrideChecker.kt
+1 -1
View File
@@ -151,7 +151,7 @@ class JavaOverrideChecker internal constructor(
val baseParameterTypes = listOfNotNull(receiverTypeRef) + baseDeclaration.valueParameters.map { it.returnTypeRef } val baseParameterTypes = listOfNotNull(receiverTypeRef) + baseDeclaration.valueParameters.map { it.returnTypeRef }
if (overrideCandidate.valueParameters.size != baseParameterTypes.size) return false 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) -> return overrideCandidate.valueParameters.zip(baseParameterTypes).all { (paramFromJava, baseType) ->
isEqualTypes(paramFromJava.returnTypeRef, baseType, substitutor) isEqualTypes(paramFromJava.returnTypeRef, baseType, substitutor)
} }
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirControlFlowStatementsResolveTransformer.kt
+2 -9
View File
@@ -142,22 +142,15 @@ class FirControlFlowStatementsResolveTransformer(transformer: FirBodyResolveTran
dataFlowAnalyzer.exitTryMainBlock() dataFlowAnalyzer.exitTryMainBlock()
tryExpression.transformCatches(this, ResolutionMode.ContextDependent) tryExpression.transformCatches(this, ResolutionMode.ContextDependent)
var callCompleted = false var callCompleted: Boolean
@Suppress("NAME_SHADOWING") @Suppress("NAME_SHADOWING")
var result = syntheticCallGenerator.generateCalleeForTryExpression(tryExpression, resolutionContext)?.let { var result = syntheticCallGenerator.generateCalleeForTryExpression(tryExpression, resolutionContext).let {
val expectedTypeRef = data.expectedType val expectedTypeRef = data.expectedType
val completionResult = callCompleter.completeCall(it, expectedTypeRef) val completionResult = callCompleter.completeCall(it, expectedTypeRef)
callCompleted = completionResult.callCompleted callCompleted = completionResult.callCompleted
completionResult.result completionResult.result
} ?: run {
tryExpression.resultType = buildErrorTypeRef {
diagnostic = ConeSimpleDiagnostic("Can't resolve try expression", DiagnosticKind.InferenceError)
}
callCompleted = true
tryExpression
} }
result = if (result.finallyBlock != null) { result = if (result.finallyBlock != null) {
result.also { dataFlowAnalyzer.enterFinallyBlock() } result.also { dataFlowAnalyzer.enterFinallyBlock() }
.transformFinallyBlock(transformer, ResolutionMode.ContextIndependent) .transformFinallyBlock(transformer, ResolutionMode.ContextIndependent)