diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/LazyTopDownAnalyzer.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/LazyTopDownAnalyzer.kt index 01be3bc3ce9..70ffe354bed 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/LazyTopDownAnalyzer.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/LazyTopDownAnalyzer.kt @@ -216,12 +216,12 @@ class LazyTopDownAnalyzer( declarationResolver.checkRedeclarationsInPackages(topLevelDescriptorProvider, topLevelFqNames) declarationResolver.checkRedeclarations(c) + declarationResolver.resolveAnnotationsOnFiles(c, fileScopeProvider) + overrideResolver.check(c) varianceChecker.check(c) - declarationResolver.resolveAnnotationsOnFiles(c, fileScopeProvider) - overloadResolver.checkOverloads(c) bodyResolver.resolveBodies(c) diff --git a/compiler/testData/diagnostics/testsWithStdLib/experimental/fileOptInSuppressesOverride.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/experimental/fileOptInSuppressesOverride.fir.kt deleted file mode 100644 index 371734687c2..00000000000 --- a/compiler/testData/diagnostics/testsWithStdLib/experimental/fileOptInSuppressesOverride.fir.kt +++ /dev/null @@ -1,16 +0,0 @@ -@file:OptIn(Marker::class) - -@RequiresOptIn -@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION) -annotation class Marker - -@Marker -fun experimental() {} - -interface MyInterface { - fun execute() -} - -class MyClass : MyInterface { - override fun execute() = experimental() -} diff --git a/compiler/testData/diagnostics/testsWithStdLib/experimental/fileOptInSuppressesOverride.kt b/compiler/testData/diagnostics/testsWithStdLib/experimental/fileOptInSuppressesOverride.kt index b3742395f60..50245a9510f 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/experimental/fileOptInSuppressesOverride.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/experimental/fileOptInSuppressesOverride.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL @file:OptIn(Marker::class) @RequiresOptIn @@ -12,5 +13,5 @@ interface MyInterface { } class MyClass : MyInterface { - override fun execute() = experimental() + override fun execute() = experimental() }