From fa6ad4139501a59b7277f310eb82fe40b46de066 Mon Sep 17 00:00:00 2001 From: Kirill Rakhman Date: Tue, 16 Jan 2024 09:14:19 +0100 Subject: [PATCH] Revert "[FE 1.0] Fix new compilation warnings after #KT-63208" This reverts commit dc0f4e69953250af29b19801c3b8b9c052be6c08. --- .../src/org/jetbrains/kotlin/resolve/LazyTopDownAnalyzer.kt | 2 +- .../src/org/jetbrains/kotlin/resolve/calls/CandidateResolver.kt | 2 +- .../lazy/declarations/AbstractPsiBasedDeclarationProvider.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/LazyTopDownAnalyzer.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/LazyTopDownAnalyzer.kt index 7b514919306..a75d5f29805 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/LazyTopDownAnalyzer.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/LazyTopDownAnalyzer.kt @@ -100,7 +100,7 @@ class LazyTopDownAnalyzer( assert(file.isScript() || packageDirective != null) { "No package in a non-script file: " + file } packageDirective?.accept(this) c.addFile(file) - if (packageDirective != null) topLevelFqNames.put(file.packageFqName, packageDirective) + topLevelFqNames.put(file.packageFqName, packageDirective) } override fun visitPackageDirective(directive: KtPackageDirective) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CandidateResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CandidateResolver.kt index 2880edf5c9d..52e567ed247 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CandidateResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CandidateResolver.kt @@ -389,7 +389,7 @@ class CandidateResolver( } } } - if (resultingType != null) argumentTypes.add(resultingType) + argumentTypes.add(resultingType) candidateCall.recordArgumentMatchStatus(argument, matchStatus) } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/AbstractPsiBasedDeclarationProvider.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/AbstractPsiBasedDeclarationProvider.kt index 8722867c52d..70a17de9e55 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/AbstractPsiBasedDeclarationProvider.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/AbstractPsiBasedDeclarationProvider.kt @@ -54,7 +54,7 @@ abstract class AbstractPsiBasedDeclarationProvider(storageManager: StorageManage is KtClassOrObject -> classesAndObjects.put(declaration.nameAsName.safeNameForLazyResolve(), KtClassInfoUtil.createClassOrObjectInfo(declaration)) is KtScript -> - scripts.put(KtScriptInfo(declaration).script.nameAsName!!, KtScriptInfo(declaration)) + scripts.put(KtScriptInfo(declaration).script.nameAsName, KtScriptInfo(declaration)) is KtDestructuringDeclaration -> { for (entry in declaration.entries) { val name = entry.nameAsName.safeNameForLazyResolve()