From 095a5d1fdff1cb41a90e4e4fa916dac3fdaf5827 Mon Sep 17 00:00:00 2001
From: Victor Petukhov <victor.petukhov@jetbrains.com>
Date: Fri, 11 Feb 2022 11:43:42 +0300
Subject: [PATCH] [FIR] Get rid of unnecessary opt ins

---
 .../fir/analysis/diagnostics/coneDiagnosticToFirDiagnostic.kt  | 1 -
 .../org/jetbrains/kotlin/fir/resolve/calls/ResolutionStages.kt | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/coneDiagnosticToFirDiagnostic.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/coneDiagnosticToFirDiagnostic.kt
index 1351a4e91d7..839a5e0fe4a 100644
--- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/coneDiagnosticToFirDiagnostic.kt
+++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/coneDiagnosticToFirDiagnostic.kt
@@ -264,7 +264,6 @@ private fun mapInapplicableCandidateError(
     }
 }
 
-@OptIn(ExperimentalStdlibApi::class)
 private fun mapSystemHasContradictionError(
     session: FirSession,
     diagnostic: ConeConstraintSystemHasContradiction,
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ResolutionStages.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ResolutionStages.kt
index 0e3c113bfcf..a7ca887aa9f 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ResolutionStages.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ResolutionStages.kt
@@ -256,7 +256,6 @@ private fun Candidate.findClosestMatchingReceivers(
 object CheckDslScopeViolation : ResolutionStage() {
     private val dslMarkerClassId = ClassId.fromString("kotlin/DslMarker")
 
-    @OptIn(ExperimentalStdlibApi::class)
     override suspend fun check(candidate: Candidate, callInfo: CallInfo, sink: CheckerSink, context: ResolutionContext) {
         fun checkReceiverValue(receiverValue: ReceiverValue?) {
             if (receiverValue is ImplicitReceiverValue<*>) {
@@ -333,7 +332,6 @@ object CheckDslScopeViolation : ResolutionStage() {
         }
     }
 
-    @OptIn(ExperimentalStdlibApi::class)
     private fun ImplicitReceiverValue<*>.getDslMarkersOfImplicitReceiver(context: ResolutionContext): Set<ClassId> {
         return buildSet {
             (boundSymbol as? FirAnonymousFunctionSymbol)?.fir?.matchingParameterFunctionType?.let {
@@ -358,7 +356,6 @@ object CheckDslScopeViolation : ResolutionStage() {
         }
     }
 
-    @OptIn(ExperimentalStdlibApi::class)
     private fun FirThisReceiverExpression.getDslMarkersOfThisReceiverExpression(context: ResolutionContext): Set<ClassId> {
         return buildSet {
             collectDslMarkerAnnotations(context, typeRef.coneType)