diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInference.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInference.kt
index 36d5a357534..5a6ba02cc92 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInference.kt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInference.kt
@@ -1,4 +1,4 @@
-fun <T> foo(@<!OPT_IN_USAGE_ERROR!>BuilderInference<!> block: MutableList<T>.() -> Unit): T = null!!
+fun <T> foo(@<!DEPRECATION, OPT_IN_USAGE_ERROR!>BuilderInference<!> block: MutableList<T>.() -> Unit): T = null!!
 
 fun takeString(s: String) {}
 
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInferenceFromStdlib.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInferenceFromStdlib.kt
index 24b0e564137..e21fc1cd012 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInferenceFromStdlib.kt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInferenceFromStdlib.kt
@@ -12,7 +12,7 @@ fun test_2() {
     takeList(list)
 }
 
-fun <E> myBuildList(@<!OPT_IN_USAGE_ERROR!>BuilderInference<!> builderAction: MutableList<E>.() -> Unit): List<E> {
+fun <E> myBuildList(@<!DEPRECATION, OPT_IN_USAGE_ERROR!>BuilderInference<!> builderAction: MutableList<E>.() -> Unit): List<E> {
     return ArrayList<E>().apply(builderAction)
 }
 
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/KtFirCompositeScope.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/KtFirCompositeScope.kt
index 8957b783f92..93a49969839 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/KtFirCompositeScope.kt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/KtFirCompositeScope.kt
@@ -2,7 +2,7 @@ interface KtScope {
     fun getAllNames(): Set<String>
 }
 
-inline fun <E> buildSet(@<!OPT_IN_USAGE_ERROR!>BuilderInference<!> builderAction: MutableSet<E>.() -> Unit): Set<E> {
+inline fun <E> buildSet(@<!DEPRECATION, OPT_IN_USAGE_ERROR!>BuilderInference<!> builderAction: MutableSet<E>.() -> Unit): Set<E> {
     return null!!
 }
 
diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java
index 6c61bc2a5ca..3ca6422f1ae 100644
--- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java
+++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java
@@ -19397,6 +19397,12 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
             runTest("compiler/testData/codegen/box/inference/builderInferenceLeakingVariable.kt");
         }
 
+        @Test
+        @TestMetadata("builderInferenceWithAnnotation.kt")
+        public void testBuilderInferenceWithAnnotation() throws Exception {
+            runTest("compiler/testData/codegen/box/inference/builderInferenceWithAnnotation.kt");
+        }
+
         @Test
         @TestMetadata("capturedStarProjection.kt")
         public void testCapturedStarProjection() throws Exception {
diff --git a/compiler/testData/codegen/box/coroutines/asyncIteratorNullMerge_1_3.kt b/compiler/testData/codegen/box/coroutines/asyncIteratorNullMerge_1_3.kt
index 5518a63243e..f8ec24639ef 100644
--- a/compiler/testData/codegen/box/coroutines/asyncIteratorNullMerge_1_3.kt
+++ b/compiler/testData/codegen/box/coroutines/asyncIteratorNullMerge_1_3.kt
@@ -20,7 +20,7 @@ interface AsyncIterator<out T> {
 }
 
 @OptIn(ExperimentalTypeInference::class)
-fun <T> asyncGenerate(@BuilderInference block: suspend AsyncGenerator<T>.() -> Unit): AsyncSequence<T> = object : AsyncSequence<T> {
+fun <T> asyncGenerate(block: suspend AsyncGenerator<T>.() -> Unit): AsyncSequence<T> = object : AsyncSequence<T> {
     override fun iterator(): AsyncIterator<T> {
         val iterator = AsyncGeneratorIterator<T>()
         iterator.nextStep = block.createCoroutine(receiver = iterator, completion = iterator)
diff --git a/compiler/testData/codegen/box/coroutines/asyncIteratorToList_1_3.kt b/compiler/testData/codegen/box/coroutines/asyncIteratorToList_1_3.kt
index ea9d202d869..11eb467845e 100644
--- a/compiler/testData/codegen/box/coroutines/asyncIteratorToList_1_3.kt
+++ b/compiler/testData/codegen/box/coroutines/asyncIteratorToList_1_3.kt
@@ -20,7 +20,7 @@ interface AsyncIterator<out T> {
 }
 
 @OptIn(ExperimentalTypeInference::class)
-fun <T> asyncGenerate(@BuilderInference block: suspend AsyncGenerator<T>.() -> Unit): AsyncSequence<T> = object : AsyncSequence<T> {
+fun <T> asyncGenerate(block: suspend AsyncGenerator<T>.() -> Unit): AsyncSequence<T> = object : AsyncSequence<T> {
     override fun iterator(): AsyncIterator<T> {
         val iterator = AsyncGeneratorIterator<T>()
         iterator.nextStep = block.createCoroutine(receiver = iterator, completion = iterator)
diff --git a/compiler/testData/codegen/box/coroutines/asyncIterator_1_3.kt b/compiler/testData/codegen/box/coroutines/asyncIterator_1_3.kt
index 566ec45efe3..ac1319b20ae 100644
--- a/compiler/testData/codegen/box/coroutines/asyncIterator_1_3.kt
+++ b/compiler/testData/codegen/box/coroutines/asyncIterator_1_3.kt
@@ -20,7 +20,7 @@ interface AsyncIterator<out T> {
 }
 
 @OptIn(ExperimentalTypeInference::class)
-fun <T> asyncGenerate(@BuilderInference block: suspend AsyncGenerator<T>.() -> Unit): AsyncSequence<T> = object : AsyncSequence<T> {
+fun <T> asyncGenerate(block: suspend AsyncGenerator<T>.() -> Unit): AsyncSequence<T> = object : AsyncSequence<T> {
     override fun iterator(): AsyncIterator<T> {
         val iterator = AsyncGeneratorIterator<T>()
         iterator.nextStep = block.createCoroutine(receiver = iterator, completion = iterator)
diff --git a/compiler/testData/codegen/box/coroutines/builderInferenceAndGenericArrayAcessCall.kt b/compiler/testData/codegen/box/coroutines/builderInferenceAndGenericArrayAcessCall.kt
index be96d49a938..94c6f118f35 100644
--- a/compiler/testData/codegen/box/coroutines/builderInferenceAndGenericArrayAcessCall.kt
+++ b/compiler/testData/codegen/box/coroutines/builderInferenceAndGenericArrayAcessCall.kt
@@ -7,7 +7,7 @@ interface Foo<T>
 class FooImpl<T> : Foo<T>
 
 @OptIn(ExperimentalTypeInference::class)
-fun <T> myflow(@BuilderInference block: Foo<T>.() -> Unit): Foo<T> {
+fun <T> myflow(block: Foo<T>.() -> Unit): Foo<T> {
     val impl = FooImpl<T>()
     impl.block()
     return impl
diff --git a/compiler/testData/codegen/box/coroutines/emptyCommonConstraintSystemForCoroutineInferenceCall.kt b/compiler/testData/codegen/box/coroutines/emptyCommonConstraintSystemForCoroutineInferenceCall.kt
index bb10cd21542..2be3b030ba5 100644
--- a/compiler/testData/codegen/box/coroutines/emptyCommonConstraintSystemForCoroutineInferenceCall.kt
+++ b/compiler/testData/codegen/box/coroutines/emptyCommonConstraintSystemForCoroutineInferenceCall.kt
@@ -61,10 +61,10 @@ suspend inline fun hang(onCancellation: () -> Unit) {}
 fun <T> Flow<T>.flatMap(mapper: suspend (T) -> Flow<T>): Flow<T> = TODO()
 
 @OptIn(ExperimentalTypeInference::class)
-fun <T> flow(@BuilderInference block: suspend FlowCollector<T>.() -> Unit): Flow<T> = TODO()
+fun <T> flow(block: suspend FlowCollector<T>.() -> Unit): Flow<T> = TODO()
 
 @OptIn(ExperimentalTypeInference::class)
-inline fun <T, R> Flow<T>.flatMapLatest(@BuilderInference crossinline transform: suspend (value: T) -> Flow<R>): Flow<R> = TODO()
+inline fun <T, R> Flow<T>.flatMapLatest(crossinline transform: suspend (value: T) -> Flow<R>): Flow<R> = TODO()
 
 interface Flow<out T>
 
diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/funInterface/kt49294.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/funInterface/kt49294.kt
index 7072f9432c7..beaafafa268 100644
--- a/compiler/testData/codegen/box/coroutines/featureIntersection/funInterface/kt49294.kt
+++ b/compiler/testData/codegen/box/coroutines/featureIntersection/funInterface/kt49294.kt
@@ -23,7 +23,7 @@ suspend fun <T> Flow<T>.toList(): List<T> {
     return destination
 }
 
-fun <T> flow(@BuilderInference block: suspend FlowCollector<T>.() -> Unit): Flow<T> = SafeFlow(block)
+fun <T> flow(block: suspend FlowCollector<T>.() -> Unit): Flow<T> = SafeFlow(block)
 
 private class SafeFlow<T>(private val block: suspend FlowCollector<T>.() -> Unit) : Flow<T> {
     override suspend fun collect(collector: FlowCollector<T>) {
@@ -31,7 +31,7 @@ private class SafeFlow<T>(private val block: suspend FlowCollector<T>.() -> Unit
     }
 }
 
-fun <T> channelFlow(@BuilderInference block: suspend SendChannel<T>.() -> Unit): Flow<T> =
+fun <T> channelFlow(block: suspend SendChannel<T>.() -> Unit): Flow<T> =
     ChannelFlowBuilder(block)
 
 private open class ChannelFlowBuilder<T>(
diff --git a/compiler/testData/codegen/box/coroutines/kt30858.kt b/compiler/testData/codegen/box/coroutines/kt30858.kt
index 663813cbd26..4648981b735 100644
--- a/compiler/testData/codegen/box/coroutines/kt30858.kt
+++ b/compiler/testData/codegen/box/coroutines/kt30858.kt
@@ -15,7 +15,7 @@ fun myLaunch(
 ) {}
 
 @OptIn(kotlin.experimental.ExperimentalTypeInference::class)
-public fun <E> myProduce(@BuilderInference block: suspend MyProducerScope<E>.() -> Unit) {}
+public fun <E> myProduce(block: suspend MyProducerScope<E>.() -> Unit) {}
 
 fun <T> MyReceiveChannel<T>.debounce(period: Long) {
     myProduce<Any> {
diff --git a/compiler/testData/codegen/box/coroutines/kt31784.kt b/compiler/testData/codegen/box/coroutines/kt31784.kt
index 99d6052ba96..f59ab2aebfb 100644
--- a/compiler/testData/codegen/box/coroutines/kt31784.kt
+++ b/compiler/testData/codegen/box/coroutines/kt31784.kt
@@ -10,7 +10,7 @@ interface Builder<T : Any> {
     fun filter(filter: (T) -> Boolean)
 }
 
-fun <T : Any> build(@BuilderInference block: Builder<T>.() -> Unit): T {
+fun <T : Any> build(block: Builder<T>.() -> Unit): T {
     val o = object : Builder<T> {
         override fun filter(filter: (T) -> Boolean) {
 
diff --git a/compiler/testData/codegen/box/inference/builderInference.kt b/compiler/testData/codegen/box/inference/builderInference.kt
index 751bbf7c1a4..7aa87587980 100644
--- a/compiler/testData/codegen/box/inference/builderInference.kt
+++ b/compiler/testData/codegen/box/inference/builderInference.kt
@@ -21,7 +21,7 @@ interface LiveDataScope<T> {
 }
 
 @OptIn(ExperimentalTypeInference::class)
-fun <T> liveData(@BuilderInference block: suspend LiveDataScope<T>.() -> Unit): LiveData<T> = null!!
+fun <T> liveData(block: suspend LiveDataScope<T>.() -> Unit): LiveData<T> = null!!
 
 fun <Value> Flow<Value>.asLiveData() = liveData {
     collect(this::emit)
diff --git a/compiler/testData/codegen/box/inference/builderInference/capturedTypes.kt b/compiler/testData/codegen/box/inference/builderInference/capturedTypes.kt
index 44e58605af4..ced2a8de15f 100644
--- a/compiler/testData/codegen/box/inference/builderInference/capturedTypes.kt
+++ b/compiler/testData/codegen/box/inference/builderInference/capturedTypes.kt
@@ -5,10 +5,10 @@
 import kotlin.experimental.ExperimentalTypeInference
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R> build(@BuilderInference block: TestInterface<R>.() -> Unit) {}
+fun <R> build(block: TestInterface<R>.() -> Unit) {}
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R> build2(@BuilderInference block: TestInterface<R>.() -> Unit) {}
+fun <R> build2(block: TestInterface<R>.() -> Unit) {}
 
 interface TestInterface<R> {
     fun emit(r: R)
diff --git a/compiler/testData/codegen/box/inference/builderInference/commonSuperType.kt b/compiler/testData/codegen/box/inference/builderInference/commonSuperType.kt
index 88e3562ff18..bdf6f31f085 100644
--- a/compiler/testData/codegen/box/inference/builderInference/commonSuperType.kt
+++ b/compiler/testData/codegen/box/inference/builderInference/commonSuperType.kt
@@ -13,10 +13,10 @@ class Test {
 import kotlin.experimental.ExperimentalTypeInference
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R> build(@BuilderInference block: TestInterface<R>.() -> Unit) {}
+fun <R> build(block: TestInterface<R>.() -> Unit) {}
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R> build2(@BuilderInference block: TestInterface<R>.() -> Unit) {}
+fun <R> build2(block: TestInterface<R>.() -> Unit) {}
 
 class Inv<K>
 
diff --git a/compiler/testData/codegen/box/inference/builderInference/commonSuperTypeContravariant.kt b/compiler/testData/codegen/box/inference/builderInference/commonSuperTypeContravariant.kt
index 05f7adf6732..0ecad9b8829 100644
--- a/compiler/testData/codegen/box/inference/builderInference/commonSuperTypeContravariant.kt
+++ b/compiler/testData/codegen/box/inference/builderInference/commonSuperTypeContravariant.kt
@@ -13,10 +13,10 @@ class Test {
 import kotlin.experimental.ExperimentalTypeInference
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R1> build(@BuilderInference block: TestInterface<R1>.() -> Unit) {}
+fun <R1> build(block: TestInterface<R1>.() -> Unit) {}
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R2> build2(@BuilderInference block: TestInterface<R2>.() -> Unit) {}
+fun <R2> build2(block: TestInterface<R2>.() -> Unit) {}
 
 class In<in K>
 
diff --git a/compiler/testData/codegen/box/inference/builderInference/commonSuperTypeCovariant.kt b/compiler/testData/codegen/box/inference/builderInference/commonSuperTypeCovariant.kt
index fe8973d3f1c..0bdd03fa593 100644
--- a/compiler/testData/codegen/box/inference/builderInference/commonSuperTypeCovariant.kt
+++ b/compiler/testData/codegen/box/inference/builderInference/commonSuperTypeCovariant.kt
@@ -14,10 +14,10 @@ class Test {
 import kotlin.experimental.ExperimentalTypeInference
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R1> build(@BuilderInference block: TestInterface<R1>.() -> Unit) {}
+fun <R1> build(block: TestInterface<R1>.() -> Unit) {}
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R2> build2(@BuilderInference block: TestInterface<R2>.() -> Unit) {}
+fun <R2> build2(block: TestInterface<R2>.() -> Unit) {}
 
 class Out<out K>
 
diff --git a/compiler/testData/codegen/box/inference/builderInference/commonSuperTypeInvariant.kt b/compiler/testData/codegen/box/inference/builderInference/commonSuperTypeInvariant.kt
index 8dd32a5886e..f67609d8cc5 100644
--- a/compiler/testData/codegen/box/inference/builderInference/commonSuperTypeInvariant.kt
+++ b/compiler/testData/codegen/box/inference/builderInference/commonSuperTypeInvariant.kt
@@ -14,10 +14,10 @@ class Test {
 import kotlin.experimental.ExperimentalTypeInference
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R1> build(@BuilderInference block: TestInterface<R1>.() -> Unit) {}
+fun <R1> build(block: TestInterface<R1>.() -> Unit) {}
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R2> build2(@BuilderInference block: TestInterface<R2>.() -> Unit) {}
+fun <R2> build2(block: TestInterface<R2>.() -> Unit) {}
 
 class Inv<K>
 
diff --git a/compiler/testData/codegen/box/inference/builderInference/commonSuperTypeNullable.kt b/compiler/testData/codegen/box/inference/builderInference/commonSuperTypeNullable.kt
index 1048062e1b4..3350cbbc290 100644
--- a/compiler/testData/codegen/box/inference/builderInference/commonSuperTypeNullable.kt
+++ b/compiler/testData/codegen/box/inference/builderInference/commonSuperTypeNullable.kt
@@ -17,10 +17,10 @@ class Test {
 import kotlin.experimental.ExperimentalTypeInference
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R> build(@BuilderInference block: TestInterface<R>.() -> Unit) {}
+fun <R> build(block: TestInterface<R>.() -> Unit) {}
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R> build2(@BuilderInference block: TestInterface<R>.() -> Unit) {}
+fun <R> build2(block: TestInterface<R>.() -> Unit) {}
 
 class Inv<K>
 
diff --git a/compiler/testData/codegen/box/inference/builderInference/constraintsBetweenTwoStubVariables.kt b/compiler/testData/codegen/box/inference/builderInference/constraintsBetweenTwoStubVariables.kt
index f953deacdce..8bc279dc581 100644
--- a/compiler/testData/codegen/box/inference/builderInference/constraintsBetweenTwoStubVariables.kt
+++ b/compiler/testData/codegen/box/inference/builderInference/constraintsBetweenTwoStubVariables.kt
@@ -10,7 +10,7 @@ class Foo<K11, K22>(val key: K11) {
 }
 
 @OptIn(ExperimentalTypeInference::class)
-fun <K1, K2> build(@kotlin.BuilderInference builder: Foo<K1, K2>.() -> Unit) {}
+fun <K1, K2> build(builder: Foo<K1, K2>.() -> Unit) {}
 
 fun run(x: Int) {
     build {
diff --git a/compiler/testData/codegen/box/inference/builderInference/cstBasedOnTwoBuilderInferenceLambda.kt b/compiler/testData/codegen/box/inference/builderInference/cstBasedOnTwoBuilderInferenceLambda.kt
index 9ebb8dce482..b0e136cdad4 100644
--- a/compiler/testData/codegen/box/inference/builderInference/cstBasedOnTwoBuilderInferenceLambda.kt
+++ b/compiler/testData/codegen/box/inference/builderInference/cstBasedOnTwoBuilderInferenceLambda.kt
@@ -23,22 +23,22 @@ class B: A
 class C: A
 
 @OptIn(ExperimentalTypeInference::class)
-fun <K> build1(@BuilderInference builderAction1: In<K>.() -> Unit, @BuilderInference builderAction2: In<K>.() -> Unit): K = 1 as K
+fun <K> build1(builderAction1: In<K>.() -> Unit, builderAction2: In<K>.() -> Unit): K = 1 as K
 
 @OptIn(ExperimentalTypeInference::class)
-fun <K> build2(@BuilderInference builderAction1: In<K>.() -> Unit, @BuilderInference builderAction2: In<K>.() -> Unit): K = B() as K
+fun <K> build2(builderAction1: In<K>.() -> Unit, builderAction2: In<K>.() -> Unit): K = B() as K
 
 @OptIn(ExperimentalTypeInference::class)
-fun <K> build3(@BuilderInference builderAction1: Out<K>.() -> Unit, @BuilderInference builderAction2: Out<K>.() -> Unit): K = 1 as K
+fun <K> build3(builderAction1: Out<K>.() -> Unit, builderAction2: Out<K>.() -> Unit): K = 1 as K
 
 @OptIn(ExperimentalTypeInference::class)
-fun <K> build4(@BuilderInference builderAction1: Out<K>.() -> Unit, @BuilderInference builderAction2: Out<K>.() -> Unit): K = B() as K
+fun <K> build4(builderAction1: Out<K>.() -> Unit, builderAction2: Out<K>.() -> Unit): K = B() as K
 
 @OptIn(ExperimentalTypeInference::class)
-fun <K> build5(@BuilderInference builderAction1: Inv<K>.() -> Unit, @BuilderInference builderAction2: Inv<K>.() -> Unit): K = 1 as K
+fun <K> build5(builderAction1: Inv<K>.() -> Unit, builderAction2: Inv<K>.() -> Unit): K = 1 as K
 
 @OptIn(ExperimentalTypeInference::class)
-fun <K> build6(@BuilderInference builderAction1: Inv<K>.() -> Unit, @BuilderInference builderAction2: Inv<K>.() -> Unit): K = B() as K
+fun <K> build6(builderAction1: Inv<K>.() -> Unit, builderAction2: Inv<K>.() -> Unit): K = B() as K
 
 @OptIn(ExperimentalStdlibApi::class)
 fun box(): String {
diff --git a/compiler/testData/codegen/box/inference/builderInference/intersect.kt b/compiler/testData/codegen/box/inference/builderInference/intersect.kt
index a3631c6e115..1ecab396562 100644
--- a/compiler/testData/codegen/box/inference/builderInference/intersect.kt
+++ b/compiler/testData/codegen/box/inference/builderInference/intersect.kt
@@ -13,10 +13,10 @@ class Test {
 import kotlin.experimental.ExperimentalTypeInference
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R1> build(@BuilderInference block: TestInterface<R1>.() -> Unit) {}
+fun <R1> build(block: TestInterface<R1>.() -> Unit) {}
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R2> build2(@BuilderInference block: TestInterface<R2>.() -> Unit) {}
+fun <R2> build2(block: TestInterface<R2>.() -> Unit) {}
 
 class In<in K>
 
diff --git a/compiler/testData/codegen/box/inference/builderInference/kt41164.kt b/compiler/testData/codegen/box/inference/builderInference/kt41164.kt
index 3333a02a96a..d7aa69ba9f5 100644
--- a/compiler/testData/codegen/box/inference/builderInference/kt41164.kt
+++ b/compiler/testData/codegen/box/inference/builderInference/kt41164.kt
@@ -8,7 +8,7 @@ interface MyFlow<out T>
 
 fun <K> select(x: K, y: K): K = x
 @OptIn(ExperimentalTypeInference::class)
-fun <T> myCallbackFlow(@BuilderInference block: MyProducerScope<T>.() -> Unit): MyFlow<T> = null!!
+fun <T> myCallbackFlow(block: MyProducerScope<T>.() -> Unit): MyFlow<T> = null!!
 fun MyProducerScope<*>.myAwaitClose(block: () -> Unit = {}) {}
 fun <E> myEmptyFlow(): MyFlow<E> = null!!
 
diff --git a/compiler/testData/codegen/box/inference/builderInference/kt44241.kt b/compiler/testData/codegen/box/inference/builderInference/kt44241.kt
index e1216f9f6f6..f294a699d0c 100644
--- a/compiler/testData/codegen/box/inference/builderInference/kt44241.kt
+++ b/compiler/testData/codegen/box/inference/builderInference/kt44241.kt
@@ -11,7 +11,7 @@ class Scope<K11, K22>(
 }
 
 @OptIn(ExperimentalTypeInference::class)
-fun <K1, K2> B<K1>.scoped(@kotlin.BuilderInference binder: Scope<K1, K2>.() -> Unit) {}
+fun <K1, K2> B<K1>.scoped(binder: Scope<K1, K2>.() -> Unit) {}
 
 fun run(x: B<A>) {
     x.scoped { emit(key) }
diff --git a/compiler/testData/codegen/box/inference/builderInference/kt45083.kt b/compiler/testData/codegen/box/inference/builderInference/kt45083.kt
index 9c3aead8b3a..55c8338f08c 100644
--- a/compiler/testData/codegen/box/inference/builderInference/kt45083.kt
+++ b/compiler/testData/codegen/box/inference/builderInference/kt45083.kt
@@ -6,7 +6,7 @@ object Hello {
 }
 
 @OptIn(ExperimentalTypeInference::class)
-fun <E> buildList0(@BuilderInference builder: MutableList<E>.() -> Unit): List<E> = mutableListOf<E>().apply { builder() }
+fun <E> buildList0(builder: MutableList<E>.() -> Unit): List<E> = mutableListOf<E>().apply { builder() }
 
 val numbers = buildList0 {
     add(Hello.let { it::hello }.get())
diff --git a/compiler/testData/codegen/box/inference/builderInference/kt47744.kt b/compiler/testData/codegen/box/inference/builderInference/kt47744.kt
index e9c246bfe15..1cbd71bd87c 100644
--- a/compiler/testData/codegen/box/inference/builderInference/kt47744.kt
+++ b/compiler/testData/codegen/box/inference/builderInference/kt47744.kt
@@ -4,10 +4,10 @@
 import kotlin.experimental.ExperimentalTypeInference
 
 @OptIn(ExperimentalTypeInference::class)
-fun <T> flow(@BuilderInference block: suspend FlowCollector<T>.() -> Unit) = Flow<T>()
+fun <T> flow(block: suspend FlowCollector<T>.() -> Unit) = Flow<T>()
 
 @OptIn(ExperimentalTypeInference::class)
-fun <E> produce(@BuilderInference block: suspend SendChannel<E>.() -> Unit) {}
+fun <E> produce(block: suspend SendChannel<E>.() -> Unit) {}
 
 interface SendChannel<in E> {
     val onSend: SelectClause2<E, SendChannel<E>>
diff --git a/compiler/testData/codegen/box/inference/builderInference/kt51988.kt b/compiler/testData/codegen/box/inference/builderInference/kt51988.kt
index 1d37a53f45e..cf3af2230b9 100644
--- a/compiler/testData/codegen/box/inference/builderInference/kt51988.kt
+++ b/compiler/testData/codegen/box/inference/builderInference/kt51988.kt
@@ -3,12 +3,12 @@
 import kotlin.experimental.ExperimentalTypeInference
 
 @OptIn(ExperimentalTypeInference::class)
-fun <AB1, BB1> build(@BuilderInference block: BuilderScope<AB1>.() -> BB1): ResultProvider<AB1, BB1> = object : ResultProvider<AB1, BB1> {
+fun <AB1, BB1> build(block: BuilderScope<AB1>.() -> BB1): ResultProvider<AB1, BB1> = object : ResultProvider<AB1, BB1> {
     override fun provideResult(): AB1 = "OK" as AB1
 }
 
 @OptIn(ExperimentalTypeInference::class)
-fun <AB2, BB2> build2(@BuilderInference block: BuilderScope<AB2>.() -> BB2): ResultProvider<AB2, BB2> = object : ResultProvider<AB2, BB2> {
+fun <AB2, BB2> build2(block: BuilderScope<AB2>.() -> BB2): ResultProvider<AB2, BB2> = object : ResultProvider<AB2, BB2> {
     override fun provideResult(): AB2 = "OK" as AB2
 }
 
diff --git a/compiler/testData/codegen/box/inference/builderInference/labaledCall.kt b/compiler/testData/codegen/box/inference/builderInference/labaledCall.kt
index 219006735d2..5b69f23c302 100644
--- a/compiler/testData/codegen/box/inference/builderInference/labaledCall.kt
+++ b/compiler/testData/codegen/box/inference/builderInference/labaledCall.kt
@@ -5,7 +5,7 @@
 import kotlin.experimental.ExperimentalTypeInference
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R> build(@BuilderInference block: TestInterface<R>.() -> Unit) {}
+fun <R> build(block: TestInterface<R>.() -> Unit) {}
 
 interface TestInterface<R> {
     fun emit(r: R)
diff --git a/compiler/testData/codegen/box/inference/builderInference/lackOfNullCheckOnNullableInsideBuild.kt b/compiler/testData/codegen/box/inference/builderInference/lackOfNullCheckOnNullableInsideBuild.kt
index 3b432b05fe9..af699325246 100644
--- a/compiler/testData/codegen/box/inference/builderInference/lackOfNullCheckOnNullableInsideBuild.kt
+++ b/compiler/testData/codegen/box/inference/builderInference/lackOfNullCheckOnNullableInsideBuild.kt
@@ -15,7 +15,7 @@ class Builder<T> {
 }
 
 @OptIn(ExperimentalTypeInference::class)
-fun <T> build(@BuilderInference configure: Builder<T>.() -> Unit) =
+fun <T> build(configure: Builder<T>.() -> Unit) =
     Builder<T>().apply(configure).build()
 
 fun box(): String {
diff --git a/compiler/testData/codegen/box/inference/builderInference/memberScope.kt b/compiler/testData/codegen/box/inference/builderInference/memberScope.kt
index e569bdd35a3..42d2b17b909 100644
--- a/compiler/testData/codegen/box/inference/builderInference/memberScope.kt
+++ b/compiler/testData/codegen/box/inference/builderInference/memberScope.kt
@@ -11,7 +11,7 @@ interface TestInterface<R> {
 }
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R1> build(@BuilderInference block: TestInterface<R1>.() -> Unit) {}
+fun <R1> build(block: TestInterface<R1>.() -> Unit) {}
 
 fun Any.test() {}
 fun Any?.test2() {}
diff --git a/compiler/testData/codegen/box/inference/builderInference/nullability.kt b/compiler/testData/codegen/box/inference/builderInference/nullability.kt
index aee5f8cb73d..8c4acb36657 100644
--- a/compiler/testData/codegen/box/inference/builderInference/nullability.kt
+++ b/compiler/testData/codegen/box/inference/builderInference/nullability.kt
@@ -11,16 +11,16 @@ interface TestInterface<R> {
 }
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R1> build(@BuilderInference block: TestInterface<R1>.() -> Unit) {}
+fun <R1> build(block: TestInterface<R1>.() -> Unit) {}
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R1 : Any> build2(@BuilderInference block: TestInterface<R1>.() -> Unit) {}
+fun <R1 : Any> build2(block: TestInterface<R1>.() -> Unit) {}
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R1 : R2, R2 : Any> build3(@BuilderInference block: TestInterface<R1>.() -> Unit) {}
+fun <R1 : R2, R2 : Any> build3(block: TestInterface<R1>.() -> Unit) {}
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R1 : R2, R2> build4(x: R2, @BuilderInference block: TestInterface<R1>.() -> Unit) {}
+fun <R1 : R2, R2> build4(x: R2, block: TestInterface<R1>.() -> Unit) {}
 
 fun test(a: String?) {
     val ret1 = build {
diff --git a/compiler/testData/codegen/box/inference/builderInference/propagateInferenceSessionIntoDeclarationAnalyzers.kt b/compiler/testData/codegen/box/inference/builderInference/propagateInferenceSessionIntoDeclarationAnalyzers.kt
index 92a9a0b04df..e6cff063587 100644
--- a/compiler/testData/codegen/box/inference/builderInference/propagateInferenceSessionIntoDeclarationAnalyzers.kt
+++ b/compiler/testData/codegen/box/inference/builderInference/propagateInferenceSessionIntoDeclarationAnalyzers.kt
@@ -18,7 +18,7 @@ public interface ProducerScopeX<in E>   {
 public class FlowX<out T> {}
 
 @OptIn(ExperimentalTypeInference::class)
-public fun <T> callbackFlowX(@BuilderInference block: ProducerScopeX<T>.() -> Unit): FlowX<T> = FlowX()
+public fun <T> callbackFlowX(block: ProducerScopeX<T>.() -> Unit): FlowX<T> = FlowX()
 
 fun foo(): FlowX<String> = callbackFlowX {
     object : Callback {
diff --git a/compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferences.kt b/compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferences.kt
index fc3ed5da452..054b109ac03 100644
--- a/compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferences.kt
+++ b/compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferences.kt
@@ -14,7 +14,7 @@ fun <T> materialize() = null as T
 interface FlowCollector<in T> {}
 
 @Suppress("OPT_IN_USAGE_ERROR")
-fun <L> flow(@BuilderInference block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
+fun <L> flow(block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
 
 class Flow<out R>(private val block: suspend FlowCollector<R>.() -> Unit)
 
diff --git a/compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferencesDontRewriteAtSlice.kt b/compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferencesDontRewriteAtSlice.kt
index 5ba5719c430..58db624500d 100644
--- a/compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferencesDontRewriteAtSlice.kt
+++ b/compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferencesDontRewriteAtSlice.kt
@@ -31,7 +31,7 @@ fun foo7() = null as Foo7<Int>
 interface FlowCollector<in T> {}
 
 @OptIn(ExperimentalTypeInference::class)
-fun <L> flow(@BuilderInference block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
+fun <L> flow(block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
 
 class Flow<out R>(private val block: suspend FlowCollector<R>.() -> Unit)
 
diff --git a/compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferencesErrorType.kt b/compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferencesErrorType.kt
index fc3ed5da452..054b109ac03 100644
--- a/compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferencesErrorType.kt
+++ b/compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferencesErrorType.kt
@@ -14,7 +14,7 @@ fun <T> materialize() = null as T
 interface FlowCollector<in T> {}
 
 @Suppress("OPT_IN_USAGE_ERROR")
-fun <L> flow(@BuilderInference block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
+fun <L> flow(block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
 
 class Flow<out R>(private val block: suspend FlowCollector<R>.() -> Unit)
 
diff --git a/compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferencesNonStrictOnlyInputTypes.kt b/compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferencesNonStrictOnlyInputTypes.kt
index 77c092f0aed..fc77015f26f 100644
--- a/compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferencesNonStrictOnlyInputTypes.kt
+++ b/compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferencesNonStrictOnlyInputTypes.kt
@@ -6,17 +6,17 @@ import kotlin.experimental.ExperimentalTypeInference
 
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R> scopedFlow(@BuilderInference block: suspend CoroutineScope.(FlowCollector<R>) -> Unit): Flow<R> =
+fun <R> scopedFlow(block: suspend CoroutineScope.(FlowCollector<R>) -> Unit): Flow<R> =
     flow {
         val collector = this
         flowScope { block(collector) }
     }
 
 @OptIn(ExperimentalTypeInference::class)
-fun <T> flow(@BuilderInference block: suspend FlowCollector<T>.() -> Unit): Flow<T> = TODO()
+fun <T> flow(block: suspend FlowCollector<T>.() -> Unit): Flow<T> = TODO()
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R> flowScope(@BuilderInference block: suspend CoroutineScope.() -> R): R = TODO()
+fun <R> flowScope(block: suspend CoroutineScope.() -> R): R = TODO()
 
 interface CoroutineScope
 interface Flow<out T>
diff --git a/compiler/testData/codegen/box/inference/builderInference/specialCallsWithLambdas.kt b/compiler/testData/codegen/box/inference/builderInference/specialCallsWithLambdas.kt
index c7c5879143a..2285bc281cd 100644
--- a/compiler/testData/codegen/box/inference/builderInference/specialCallsWithLambdas.kt
+++ b/compiler/testData/codegen/box/inference/builderInference/specialCallsWithLambdas.kt
@@ -5,7 +5,7 @@ import kotlin.experimental.ExperimentalTypeInference
 interface FlowCollector<in T> {}
 
 @Suppress("OPT_IN_USAGE_ERROR")
-fun <L> flow(@BuilderInference block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
+fun <L> flow(block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
 
 class Flow<out R>(private val block: suspend FlowCollector<R>.() -> Unit)
 
diff --git a/compiler/testData/codegen/box/inference/builderInference/substituteStubTypeIntolambdaParameterDescriptor.kt b/compiler/testData/codegen/box/inference/builderInference/substituteStubTypeIntolambdaParameterDescriptor.kt
index 18429800371..f877f5014d0 100644
--- a/compiler/testData/codegen/box/inference/builderInference/substituteStubTypeIntolambdaParameterDescriptor.kt
+++ b/compiler/testData/codegen/box/inference/builderInference/substituteStubTypeIntolambdaParameterDescriptor.kt
@@ -8,7 +8,7 @@ class TypeDefinition<K : Any> {
 }
 
 @OptIn(ExperimentalTypeInference::class)
-fun <T : Any> defineType(@BuilderInference definition: TypeDefinition<T>.() -> Unit): Unit {}
+fun <T : Any> defineType(definition: TypeDefinition<T>.() -> Unit): Unit {}
 
 fun test() {
     defineType {
diff --git a/compiler/testData/codegen/box/inference/builderInference/substituteTypeVariableIntolambdaParameterDescriptor.kt b/compiler/testData/codegen/box/inference/builderInference/substituteTypeVariableIntolambdaParameterDescriptor.kt
index de3547dac23..80a632a96ff 100644
--- a/compiler/testData/codegen/box/inference/builderInference/substituteTypeVariableIntolambdaParameterDescriptor.kt
+++ b/compiler/testData/codegen/box/inference/builderInference/substituteTypeVariableIntolambdaParameterDescriptor.kt
@@ -12,7 +12,7 @@ interface FlowCollector<T> {
 }
 
 @Suppress("OPT_IN_USAGE_ERROR")
-fun <I> flow(@BuilderInference block: FlowCollector<I>.() -> Unit): I = null as I
+fun <I> flow(block: FlowCollector<I>.() -> Unit): I = null as I
 
 fun adapt(): Unit = flow {
     emit(foo { coroutine -> bar(coroutine) })
diff --git a/compiler/testData/codegen/box/inference/builderInference/substitutelambdaExtensionReceiverType.kt b/compiler/testData/codegen/box/inference/builderInference/substitutelambdaExtensionReceiverType.kt
index c12d593f6a6..3aae4afa83b 100644
--- a/compiler/testData/codegen/box/inference/builderInference/substitutelambdaExtensionReceiverType.kt
+++ b/compiler/testData/codegen/box/inference/builderInference/substitutelambdaExtensionReceiverType.kt
@@ -6,7 +6,7 @@ operator fun <T> SequenceScope<String>.plusAssign(x: SequenceScope<T>) {}
 
 @OptIn(ExperimentalTypeInference::class)
 
-fun <T> mySequence(@BuilderInference block: suspend SequenceScope<T>.() -> Unit): Sequence<T> = Sequence { iterator(block) }
+fun <T> mySequence(block: suspend SequenceScope<T>.() -> Unit): Sequence<T> = Sequence { iterator(block) }
 
 fun main() {
     val y: Sequence<String> = mySequence {
diff --git a/compiler/testData/codegen/box/inference/builderInference/topDownCompletionBreakedByNonBuilderInferenceSession.kt b/compiler/testData/codegen/box/inference/builderInference/topDownCompletionBreakedByNonBuilderInferenceSession.kt
index ade47900065..be80d840864 100644
--- a/compiler/testData/codegen/box/inference/builderInference/topDownCompletionBreakedByNonBuilderInferenceSession.kt
+++ b/compiler/testData/codegen/box/inference/builderInference/topDownCompletionBreakedByNonBuilderInferenceSession.kt
@@ -5,17 +5,17 @@ import kotlin.experimental.ExperimentalTypeInference
 
 @OptIn(ExperimentalTypeInference::class)
 class A1<T> {
-    fun <BT1> builder1(@BuilderInference configure: A2<BT1>.() -> Unit) {}
+    fun <BT1> builder1(configure: A2<BT1>.() -> Unit) {}
 }
 
 @OptIn(ExperimentalTypeInference::class)
 class A2<A2_BT1> {
-    fun <BT2> builder2(@BuilderInference configure: A3<A2_BT1, BT2>.() -> Unit) {}
+    fun <BT2> builder2(configure: A3<A2_BT1, BT2>.() -> Unit) {}
 }
 
 @OptIn(ExperimentalTypeInference::class)
 class A3<A3_BT1, A3_BT2> {
-    fun <BT3> builder3(@BuilderInference configure: A4<A3_BT1, A3_BT2, BT3>.() -> Unit) {}
+    fun <BT3> builder3(configure: A4<A3_BT1, A3_BT2, BT3>.() -> Unit) {}
 }
 
 class A4<A3_BT1, A3_BT2, A3_BT3> {
diff --git a/compiler/testData/codegen/box/inference/builderInference/topDownCompletionWithThreeBuilderInferenceCalls.kt b/compiler/testData/codegen/box/inference/builderInference/topDownCompletionWithThreeBuilderInferenceCalls.kt
index 727ad0f7094..8f8fd8d47b1 100644
--- a/compiler/testData/codegen/box/inference/builderInference/topDownCompletionWithThreeBuilderInferenceCalls.kt
+++ b/compiler/testData/codegen/box/inference/builderInference/topDownCompletionWithThreeBuilderInferenceCalls.kt
@@ -5,17 +5,17 @@ import kotlin.experimental.ExperimentalTypeInference
 
 @OptIn(ExperimentalTypeInference::class)
 class A1<T> {
-    fun <BT1> builder1(@BuilderInference configure: A2<BT1>.() -> Unit) {}
+    fun <BT1> builder1(configure: A2<BT1>.() -> Unit) {}
 }
 
 @OptIn(ExperimentalTypeInference::class)
 class A2<A2_BT1> {
-    fun <BT2> builder2(@BuilderInference configure: A3<A2_BT1, BT2>.() -> Unit) {}
+    fun <BT2> builder2(configure: A3<A2_BT1, BT2>.() -> Unit) {}
 }
 
 @OptIn(ExperimentalTypeInference::class)
 class A3<A3_BT1, A3_BT2> {
-    fun <BT3> builder3(@BuilderInference configure: A4<A3_BT1, A3_BT2, BT3>.() -> Unit) {}
+    fun <BT3> builder3(configure: A4<A3_BT1, A3_BT2, BT3>.() -> Unit) {}
 }
 
 class A4<A3_BT1, A3_BT2, A3_BT3> {
diff --git a/compiler/testData/codegen/box/inference/builderInference/topDownCompletionWithThreeBuilderInferenceCallsSameLevel.kt b/compiler/testData/codegen/box/inference/builderInference/topDownCompletionWithThreeBuilderInferenceCallsSameLevel.kt
index f9aac31418e..e1d6e6fdb61 100644
--- a/compiler/testData/codegen/box/inference/builderInference/topDownCompletionWithThreeBuilderInferenceCallsSameLevel.kt
+++ b/compiler/testData/codegen/box/inference/builderInference/topDownCompletionWithThreeBuilderInferenceCallsSameLevel.kt
@@ -5,17 +5,17 @@ import kotlin.experimental.ExperimentalTypeInference
 
 @OptIn(ExperimentalTypeInference::class)
 class A1<T> {
-    fun <BT1> builder1(@BuilderInference configure: A2<BT1>.() -> Unit) {}
+    fun <BT1> builder1(configure: A2<BT1>.() -> Unit) {}
 }
 
 @OptIn(ExperimentalTypeInference::class)
 class A2<A2_BT1> {
-    fun <BT2> builder2(@BuilderInference configure: A3<A2_BT1, BT2>.() -> Unit) {}
+    fun <BT2> builder2(configure: A3<A2_BT1, BT2>.() -> Unit) {}
 }
 
 @OptIn(ExperimentalTypeInference::class)
 class A3<A3_BT1, A3_BT2> {
-    fun <BT3> builder3(@BuilderInference configure: A4<A3_BT1, A3_BT2, BT3>.() -> Unit) {}
+    fun <BT3> builder3(configure: A4<A3_BT1, A3_BT2, BT3>.() -> Unit) {}
 }
 
 class A4<A3_BT1, A3_BT2, A3_BT3> {
diff --git a/compiler/testData/codegen/box/inference/builderInference/topDownCompletionWithTwoBuilderInferenceCalls.kt b/compiler/testData/codegen/box/inference/builderInference/topDownCompletionWithTwoBuilderInferenceCalls.kt
index 3202323ccef..2c633dbc4c6 100644
--- a/compiler/testData/codegen/box/inference/builderInference/topDownCompletionWithTwoBuilderInferenceCalls.kt
+++ b/compiler/testData/codegen/box/inference/builderInference/topDownCompletionWithTwoBuilderInferenceCalls.kt
@@ -5,12 +5,12 @@ import kotlin.experimental.ExperimentalTypeInference
 
 @OptIn(ExperimentalTypeInference::class)
 class A1<T> {
-    fun <BT1> builder1(@BuilderInference configure: A2<BT1>.() -> Unit) {}
+    fun <BT1> builder1(configure: A2<BT1>.() -> Unit) {}
 }
 
 @OptIn(ExperimentalTypeInference::class)
 class A2<A2_BT1> {
-    fun <BT2> builder2(@BuilderInference configure: A3<A2_BT1, BT2>.() -> Unit) {}
+    fun <BT2> builder2(configure: A3<A2_BT1, BT2>.() -> Unit) {}
 }
 
 class A3<A3_BT1, A3_BT2> {
diff --git a/compiler/testData/codegen/box/inference/builderInferenceLeakingVariable.kt b/compiler/testData/codegen/box/inference/builderInferenceLeakingVariable.kt
index ec472f2787e..7c395a6d68c 100644
--- a/compiler/testData/codegen/box/inference/builderInferenceLeakingVariable.kt
+++ b/compiler/testData/codegen/box/inference/builderInferenceLeakingVariable.kt
@@ -12,7 +12,7 @@ class InImpl<E>(val block: suspend In<E>.() -> Unit) : In<E> {
 }
 
 @OptIn(ExperimentalTypeInference::class)
-public fun <T> builder(@BuilderInference block: suspend In<T>.() -> Unit) {
+public fun <T> builder(block: suspend In<T>.() -> Unit) {
     InImpl(block)
 }
 
diff --git a/compiler/testData/codegen/box/inference/builderInferenceWithAnnotation.kt b/compiler/testData/codegen/box/inference/builderInferenceWithAnnotation.kt
new file mode 100644
index 00000000000..751bbf7c1a4
--- /dev/null
+++ b/compiler/testData/codegen/box/inference/builderInferenceWithAnnotation.kt
@@ -0,0 +1,31 @@
+// TARGET_BACKEND: JVM
+// WITH_STDLIB
+// ISSUE: KT-33545
+
+import kotlin.experimental.ExperimentalTypeInference
+
+interface Flow<out T> {
+    suspend fun collect(collector: FlowCollector<T>)
+}
+
+interface FlowCollector<in T> {
+    suspend fun emit(value: T)
+}
+
+inline fun <T> Flow<T>.collect(crossinline action: suspend (value: T) -> Unit): Unit {}
+
+abstract class LiveData<T>
+
+interface LiveDataScope<T> {
+    suspend fun emit(value: T)
+}
+
+@OptIn(ExperimentalTypeInference::class)
+fun <T> liveData(@BuilderInference block: suspend LiveDataScope<T>.() -> Unit): LiveData<T> = null!!
+
+fun <Value> Flow<Value>.asLiveData() = liveData {
+    collect(this::emit)
+//    collect { emit(it) }
+}
+
+fun box(): String = "OK"
diff --git a/compiler/testData/codegen/box/inference/kt35684.kt b/compiler/testData/codegen/box/inference/kt35684.kt
index 7cce32de092..da78e489a73 100644
--- a/compiler/testData/codegen/box/inference/kt35684.kt
+++ b/compiler/testData/codegen/box/inference/kt35684.kt
@@ -13,7 +13,7 @@ fun test() {
 }
 
 @OptIn(ExperimentalTypeInference::class)
-fun <U> sequence(@BuilderInference block: suspend Inv<U>.() -> Unit) {}
+fun <U> sequence(block: suspend Inv<U>.() -> Unit) {}
 
 interface Inv<T> {
     fun yield(element: T)
diff --git a/compiler/testData/codegen/box/inference/kt36446.kt b/compiler/testData/codegen/box/inference/kt36446.kt
index bd83fe1b872..8eaa6aaccd2 100644
--- a/compiler/testData/codegen/box/inference/kt36446.kt
+++ b/compiler/testData/codegen/box/inference/kt36446.kt
@@ -28,7 +28,7 @@ class ConversionBuilder<Value> {
 }
 class DefinitionBuilder<Transaction> {
     @OptIn(ExperimentalTypeInference::class)
-    fun <Value> conversion(@BuilderInference configure: ConversionBuilder<Value>.() -> Unit): Unit {}
+    fun <Value> conversion(configure: ConversionBuilder<Value>.() -> Unit): Unit {}
 }
 interface ArgumentDefinition<Value> {
     operator fun provideDelegate(thisRef: Any?, property: KProperty<*>): ArgumentReference<Value>
diff --git a/compiler/testData/codegen/box/inference/mapCollectChainWithNullResult.kt b/compiler/testData/codegen/box/inference/mapCollectChainWithNullResult.kt
index 595171ad577..08165c41b88 100644
--- a/compiler/testData/codegen/box/inference/mapCollectChainWithNullResult.kt
+++ b/compiler/testData/codegen/box/inference/mapCollectChainWithNullResult.kt
@@ -20,7 +20,7 @@ fun <T> Flow<T>.collect(action: (value: T) -> Unit): Unit =
         override fun emit(value: T) = action(value)
     })
 
-fun <T, R> Flow<T>.transform(@BuilderInference transform: FlowCollector<R>.(T) -> Unit): Flow<R> =
+fun <T, R> Flow<T>.transform(transform: FlowCollector<R>.(T) -> Unit): Flow<R> =
     flow { collect { transform(it) } }
 
 fun <T, R> Flow<T>.map(transform: (T) -> R): Flow<R> =
diff --git a/compiler/testData/codegen/box/inference/plusAssignInsideLambda.kt b/compiler/testData/codegen/box/inference/plusAssignInsideLambda.kt
index a5a2dea6921..52ad82ed5fa 100644
--- a/compiler/testData/codegen/box/inference/plusAssignInsideLambda.kt
+++ b/compiler/testData/codegen/box/inference/plusAssignInsideLambda.kt
@@ -7,7 +7,7 @@ interface SendChannel<in T> {
 }
 
 @OptIn(ExperimentalTypeInference::class)
-public fun <T> flux(@BuilderInference block: suspend SendChannel<T>.() -> Unit) {}
+public fun <T> flux(block: suspend SendChannel<T>.() -> Unit) {}
 
 suspend inline fun <T> T.collect(action: (T) -> Unit) { action(this) }
 
diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/select.kt b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/select.kt
index 9ff886db1ee..23552fcce90 100644
--- a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/select.kt
+++ b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/select.kt
@@ -8,7 +8,7 @@ interface CoroutineScope
 
 @OptIn(ExperimentalTypeInference::class)
 public fun <E> CoroutineScope.produce(
-    @BuilderInference block: suspend ProducerScope<E>.() -> Unit
+    block: suspend ProducerScope<E>.() -> Unit
 ): ReceiveChannel<E>  = TODO()
 
 interface ProducerScope<in E> : CoroutineScope, SendChannel<E> {
diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/select.txt b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/select.txt
index 5551c9fd8ea..aa8a6da4920 100644
--- a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/select.txt
+++ b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/select.txt
@@ -56,7 +56,7 @@ final class SelectKt$produceNumbers$1 {
 public final class SelectKt {
     // source: 'select.kt'
     inner (anonymous) class SelectKt$produceNumbers$1
-    public final static @org.jetbrains.annotations.NotNull method produce(@org.jetbrains.annotations.NotNull p0: CoroutineScope, @kotlin.BuilderInference @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function2): ReceiveChannel
+    public final static @org.jetbrains.annotations.NotNull method produce(@org.jetbrains.annotations.NotNull p0: CoroutineScope, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function2): ReceiveChannel
     public final static @org.jetbrains.annotations.NotNull method produceNumbers(@org.jetbrains.annotations.NotNull p0: CoroutineScope, @org.jetbrains.annotations.NotNull p1: SendChannel): ReceiveChannel
     private final static @org.jetbrains.annotations.Nullable method select$$forInline(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object
     public final static @org.jetbrains.annotations.Nullable method select(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object
diff --git a/compiler/testData/codegen/bytecodeText/coroutines/debug/localVariableCorrectLabel.kt b/compiler/testData/codegen/bytecodeText/coroutines/debug/localVariableCorrectLabel.kt
index 08be3e69140..6ddcd892ad3 100644
--- a/compiler/testData/codegen/bytecodeText/coroutines/debug/localVariableCorrectLabel.kt
+++ b/compiler/testData/codegen/bytecodeText/coroutines/debug/localVariableCorrectLabel.kt
@@ -11,7 +11,6 @@ fun main(args: Array<String>) {
 }
 
 @OptIn(ExperimentalTypeInference::class)
-@BuilderInference
 suspend fun SequenceScope<Int>.awaitSeq(): Int = 42
 
 // JVM_IR_TEMPLATES
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/changingResolveIfDontUseBuilderInference.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/changingResolveIfDontUseBuilderInference.fir.kt
index 0b0a0ac938d..c12c2dd76ab 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/changingResolveIfDontUseBuilderInference.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/changingResolveIfDontUseBuilderInference.fir.kt
@@ -5,14 +5,14 @@
 import kotlin.experimental.ExperimentalTypeInference
 
 @OptIn(ExperimentalTypeInference::class)
-fun <K, V> buildMap(@BuilderInference builderAction: MutableMap<K, V>.() -> Unit): Map<K, V> = mapOf()
+fun <K, V> buildMap(builderAction: MutableMap<K, V>.() -> Unit): Map<K, V> = mapOf()
 
 fun foo(): MutableMap<CharSequence, *> = mutableMapOf<CharSequence, String>()
 
 fun <E> MutableMap<E, *>.swap(x: MutableMap<E, *>) {}
 
 @OptIn(ExperimentalTypeInference::class)
-fun <K : V, V : CharSequence> build7(@BuilderInference builderAction: MutableMap<K, V>.() -> MutableMap<String, V>) = mutableMapOf<String, V>()
+fun <K : V, V : CharSequence> build7(builderAction: MutableMap<K, V>.() -> MutableMap<String, V>) = mutableMapOf<String, V>()
 
 fun <K> id(x: K): K = x
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/changingResolveIfDontUseBuilderInference.kt b/compiler/testData/diagnostics/tests/inference/builderInference/changingResolveIfDontUseBuilderInference.kt
index 0ec13a22265..137e9dac5db 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/changingResolveIfDontUseBuilderInference.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/changingResolveIfDontUseBuilderInference.kt
@@ -5,14 +5,14 @@
 import kotlin.experimental.ExperimentalTypeInference
 
 @OptIn(ExperimentalTypeInference::class)
-fun <K, V> buildMap(@BuilderInference builderAction: MutableMap<K, V>.() -> Unit): Map<K, V> = mapOf()
+fun <K, V> buildMap(builderAction: MutableMap<K, V>.() -> Unit): Map<K, V> = mapOf()
 
 fun foo(): MutableMap<CharSequence, *> = mutableMapOf<CharSequence, String>()
 
 fun <E> MutableMap<E, *>.swap(x: MutableMap<E, *>) {}
 
 @OptIn(ExperimentalTypeInference::class)
-fun <K : V, V : CharSequence> build7(@BuilderInference builderAction: MutableMap<K, V>.() -> MutableMap<String, V>) = mutableMapOf<String, V>()
+fun <K : V, V : CharSequence> build7(builderAction: MutableMap<K, V>.() -> MutableMap<String, V>) = mutableMapOf<String, V>()
 
 fun <K> id(x: K): K = x
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/changingResolveIfDontUseBuilderInference.txt b/compiler/testData/diagnostics/tests/inference/builderInference/changingResolveIfDontUseBuilderInference.txt
index 169138939d9..e90e72cd08f 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/changingResolveIfDontUseBuilderInference.txt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/changingResolveIfDontUseBuilderInference.txt
@@ -1,7 +1,7 @@
 package
 
-@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ K : V, /*1*/ V : kotlin.CharSequence> build7(/*0*/ @kotlin.BuilderInference builderAction: kotlin.collections.MutableMap<K, V>.() -> kotlin.collections.MutableMap<kotlin.String, V>): kotlin.collections.MutableMap<kotlin.String, V>
-@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ K, /*1*/ V> buildMap(/*0*/ @kotlin.BuilderInference builderAction: kotlin.collections.MutableMap<K, V>.() -> kotlin.Unit): kotlin.collections.Map<K, V>
+@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ K : V, /*1*/ V : kotlin.CharSequence> build7(/*0*/ builderAction: kotlin.collections.MutableMap<K, V>.() -> kotlin.collections.MutableMap<kotlin.String, V>): kotlin.collections.MutableMap<kotlin.String, V>
+@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ K, /*1*/ V> buildMap(/*0*/ builderAction: kotlin.collections.MutableMap<K, V>.() -> kotlin.Unit): kotlin.collections.Map<K, V>
 public fun foo(): kotlin.collections.MutableMap<kotlin.CharSequence, *>
 public fun </*0*/ K> id(/*0*/ x: K): K
 @kotlin.OptIn(markerClass = {kotlin.ExperimentalStdlibApi::class}) public fun main(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/kt47744.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/kt47744.fir.kt
index 3e7b0a524c2..0baf68042a2 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/kt47744.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/kt47744.fir.kt
@@ -5,10 +5,10 @@
 import kotlin.experimental.ExperimentalTypeInference
 
 @OptIn(ExperimentalTypeInference::class)
-fun <T> flow(@BuilderInference block: suspend FlowCollector<T>.() -> Unit) = Flow<T>()
+fun <T> flow(block: suspend FlowCollector<T>.() -> Unit) = Flow<T>()
 
 @OptIn(ExperimentalTypeInference::class)
-fun <E> produce(@BuilderInference block: suspend SendChannel<E>.() -> Unit) {}
+fun <E> produce(block: suspend SendChannel<E>.() -> Unit) {}
 
 interface SendChannel<in E> {
     val onSend: SelectClause2<E, SendChannel<E>>
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/kt47744.kt b/compiler/testData/diagnostics/tests/inference/builderInference/kt47744.kt
index eb50e45ff7b..0a38fa319ea 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/kt47744.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/kt47744.kt
@@ -5,10 +5,10 @@
 import kotlin.experimental.ExperimentalTypeInference
 
 @OptIn(ExperimentalTypeInference::class)
-fun <T> flow(@BuilderInference block: suspend FlowCollector<T>.() -> Unit) = Flow<T>()
+fun <T> flow(block: suspend FlowCollector<T>.() -> Unit) = Flow<T>()
 
 @OptIn(ExperimentalTypeInference::class)
-fun <E> produce(@BuilderInference block: suspend SendChannel<E>.() -> Unit) {}
+fun <E> produce(block: suspend SendChannel<E>.() -> Unit) {}
 
 interface SendChannel<in E> {
     val onSend: SelectClause2<E, SendChannel<E>>
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/kt47744.txt b/compiler/testData/diagnostics/tests/inference/builderInference/kt47744.txt
index 5909d027a0d..7dd968e1832 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/kt47744.txt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/kt47744.txt
@@ -1,7 +1,7 @@
 package
 
-@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ T> flow(/*0*/ @kotlin.BuilderInference block: suspend FlowCollector<T>.() -> kotlin.Unit): Flow<T>
-@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ E> produce(/*0*/ @kotlin.BuilderInference block: suspend SendChannel<E>.() -> kotlin.Unit): kotlin.Unit
+@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ T> flow(/*0*/ block: suspend FlowCollector<T>.() -> kotlin.Unit): Flow<T>
+@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ E> produce(/*0*/ block: suspend SendChannel<E>.() -> kotlin.Unit): kotlin.Unit
 public inline fun </*0*/ R> select(/*0*/ crossinline builder: SelectBuilder<R>.() -> kotlin.Unit): R
 public fun test(): kotlin.Unit
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/kt49285.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/kt49285.fir.kt
index eeb0138025a..2cedb771bdf 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/kt49285.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/kt49285.fir.kt
@@ -7,10 +7,10 @@ class Foo<T> {
 }
 
 @OptIn(ExperimentalTypeInference::class)
-fun <K1> myBuilder1(@BuilderInference builder: Foo<K1>.() -> Foo<K1>): Foo<K1> = Foo<K1>().apply { builder() }
+fun <K1> myBuilder1(builder: Foo<K1>.() -> Foo<K1>): Foo<K1> = Foo<K1>().apply { builder() }
 
 @OptIn(ExperimentalTypeInference::class)
-fun <K2> myBuilder2(@BuilderInference builder: Foo<K2>.() -> Unit): Foo<K2> = Foo<K2>().apply(builder)
+fun <K2> myBuilder2(builder: Foo<K2>.() -> Unit): Foo<K2> = Foo<K2>().apply(builder)
 
 val result1 = myBuilder1 {
     add(null)
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/kt49285.kt b/compiler/testData/diagnostics/tests/inference/builderInference/kt49285.kt
index 8ed2993dd6b..a44869a9145 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/kt49285.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/kt49285.kt
@@ -7,10 +7,10 @@ class Foo<T> {
 }
 
 @OptIn(ExperimentalTypeInference::class)
-fun <K1> myBuilder1(@BuilderInference builder: Foo<K1>.() -> Foo<K1>): Foo<K1> = Foo<K1>().apply { builder() }
+fun <K1> myBuilder1(builder: Foo<K1>.() -> Foo<K1>): Foo<K1> = Foo<K1>().apply { builder() }
 
 @OptIn(ExperimentalTypeInference::class)
-fun <K2> myBuilder2(@BuilderInference builder: Foo<K2>.() -> Unit): Foo<K2> = Foo<K2>().apply(builder)
+fun <K2> myBuilder2(builder: Foo<K2>.() -> Unit): Foo<K2> = Foo<K2>().apply(builder)
 
 val result1 = myBuilder1 {
     add(null)
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/kt49285.txt b/compiler/testData/diagnostics/tests/inference/builderInference/kt49285.txt
index 3761e785835..f5eacf58c32 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/kt49285.txt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/kt49285.txt
@@ -1,8 +1,8 @@
 package
 
 public val result1: Foo<kotlin.Nothing?>
-@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ K1> myBuilder1(/*0*/ @kotlin.BuilderInference builder: Foo<K1>.() -> Foo<K1>): Foo<K1>
-@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ K2> myBuilder2(/*0*/ @kotlin.BuilderInference builder: Foo<K2>.() -> kotlin.Unit): Foo<K2>
+@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ K1> myBuilder1(/*0*/ builder: Foo<K1>.() -> Foo<K1>): Foo<K1>
+@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ K2> myBuilder2(/*0*/ builder: Foo<K2>.() -> kotlin.Unit): Foo<K2>
 
 public final class Foo</*0*/ T> {
     public constructor Foo</*0*/ T>()
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/kt49828.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/kt49828.fir.kt
index faad5dd9fee..3edd24a0e44 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/kt49828.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/kt49828.fir.kt
@@ -201,7 +201,7 @@ interface Foo2<K, V> {
     fun entries(): MutableSet<MutableMap.MutableEntry<K, V>>
 }
 
-fun <L, K, V> twoBuilderLambdas(@BuilderInference block: Foo<L>.() -> Unit, @BuilderInference block2: Foo2<K, V>.() -> Unit) {}
+fun <L, K, V> twoBuilderLambdas(block: Foo<L>.() -> Unit, block2: Foo2<K, V>.() -> Unit) {}
 
 fun test() {
     twoBuilderLambdas(
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/kt49828.kt b/compiler/testData/diagnostics/tests/inference/builderInference/kt49828.kt
index 4ed8dd2e8ac..67364b1a5bf 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/kt49828.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/kt49828.kt
@@ -201,7 +201,7 @@ interface Foo2<K, V> {
     fun entries(): MutableSet<MutableMap.MutableEntry<K, V>>
 }
 
-fun <L, K, V> twoBuilderLambdas(@BuilderInference block: Foo<L>.() -> Unit, @BuilderInference block2: Foo2<K, V>.() -> Unit) {}
+fun <L, K, V> twoBuilderLambdas(block: Foo<L>.() -> Unit, block2: Foo2<K, V>.() -> Unit) {}
 
 fun test() {
     twoBuilderLambdas(
@@ -209,13 +209,13 @@ fun test() {
             add("")
             with (get()) {
                 with (listOf(1)) {
-                    <!STUB_TYPE_IN_RECEIVER_CAUSES_AMBIGUITY("String; L; String; LAMBDA_EXPRESSION")!><!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE, OVERLOAD_RESOLUTION_AMBIGUITY, OVERLOAD_RESOLUTION_AMBIGUITY_BECAUSE_OF_STUB_TYPES!>bar<!>()<!>
+                    <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE, OVERLOAD_RESOLUTION_AMBIGUITY!>bar<!>()
                 }
             }
         },
         {
             put(1, "one")
-            <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE, OVERLOAD_RESOLUTION_AMBIGUITY, OVERLOAD_RESOLUTION_AMBIGUITY_BECAUSE_OF_STUB_TYPES!>foo11<!>(<!STUB_TYPE_IN_ARGUMENT_CAUSES_AMBIGUITY("MutableSet<MutableMap.MutableEntry<Int, String>>; K, V; Int, String")!>entries()<!>)
+            <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE, OVERLOAD_RESOLUTION_AMBIGUITY!>foo11<!>(entries())
         }
     )
 }
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/kt49828.txt b/compiler/testData/diagnostics/tests/inference/builderInference/kt49828.txt
index 6fe2cd86100..1ea391c302c 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/kt49828.txt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/kt49828.txt
@@ -19,7 +19,7 @@ public fun foo11(/*0*/ x: kotlin.collections.MutableSet<kotlin.collections.Mutab
 @kotlin.jvm.JvmName(name = "foo111") public fun foo11(/*0*/ x: kotlin.collections.MutableSet<kotlin.collections.MutableMap.MutableEntry<kotlin.String, kotlin.Int>>): kotlin.Unit
 public fun main(): kotlin.Unit
 public fun test(): kotlin.Unit
-public fun </*0*/ L, /*1*/ K, /*2*/ V> twoBuilderLambdas(/*0*/ @kotlin.BuilderInference block: Foo<L>.() -> kotlin.Unit, /*1*/ @kotlin.BuilderInference block2: Foo2<K, V>.() -> kotlin.Unit): kotlin.Unit
+public fun </*0*/ L, /*1*/ K, /*2*/ V> twoBuilderLambdas(/*0*/ block: Foo<L>.() -> kotlin.Unit, /*1*/ block2: Foo2<K, V>.() -> kotlin.Unit): kotlin.Unit
 public fun kotlin.Int.bar(): kotlin.Unit
 @kotlin.jvm.JvmName(name = "bar1") public fun kotlin.String.bar(): kotlin.Unit
 public fun kotlin.Int.foo0003(/*0*/ y: kotlin.Number, /*1*/ z: kotlin.String): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/labaledCall.kt b/compiler/testData/diagnostics/tests/inference/builderInference/labaledCall.kt
index 654e732240c..c2a61b56e8d 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/labaledCall.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/labaledCall.kt
@@ -6,7 +6,7 @@
 import kotlin.experimental.ExperimentalTypeInference
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R> build(@BuilderInference block: TestInterface<R>.() -> Unit): R = TODO()
+fun <R> build(block: TestInterface<R>.() -> Unit): R = TODO()
 
 interface TestInterface<R> {
     fun emit(r: R)
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/labaledCall.txt b/compiler/testData/diagnostics/tests/inference/builderInference/labaledCall.txt
index 39ea44b5681..a3c60bbbf8a 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/labaledCall.txt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/labaledCall.txt
@@ -1,6 +1,6 @@
 package
 
-@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ R> build(/*0*/ @kotlin.BuilderInference block: TestInterface<R>.() -> kotlin.Unit): R
+@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ R> build(/*0*/ block: TestInterface<R>.() -> kotlin.Unit): R
 public fun main(): kotlin.Unit
 
 public interface TestInterface</*0*/ R> {
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/simpleLambdaInCallWithAnotherLambdaWithBuilderInference.kt b/compiler/testData/diagnostics/tests/inference/builderInference/simpleLambdaInCallWithAnotherLambdaWithBuilderInference.kt
index 2359743985f..4b30798bdcc 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/simpleLambdaInCallWithAnotherLambdaWithBuilderInference.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/simpleLambdaInCallWithAnotherLambdaWithBuilderInference.kt
@@ -7,7 +7,7 @@ import kotlin.experimental.ExperimentalTypeInference
 @OptIn(ExperimentalTypeInference::class)
 fun <R> combined(
     check: () -> Unit,
-    @BuilderInference block: TestInterface<R>.() -> Unit
+    block: TestInterface<R>.() -> Unit
 ): R = TODO()
 
 interface TestInterface<R> {
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/simpleLambdaInCallWithAnotherLambdaWithBuilderInference.txt b/compiler/testData/diagnostics/tests/inference/builderInference/simpleLambdaInCallWithAnotherLambdaWithBuilderInference.txt
index ec07844fd2f..e56a038d7e6 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/simpleLambdaInCallWithAnotherLambdaWithBuilderInference.txt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/simpleLambdaInCallWithAnotherLambdaWithBuilderInference.txt
@@ -1,6 +1,6 @@
 package
 
-@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ R> combined(/*0*/ check: () -> kotlin.Unit, /*1*/ @kotlin.BuilderInference block: TestInterface<R>.() -> kotlin.Unit): R
+@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ R> combined(/*0*/ check: () -> kotlin.Unit, /*1*/ block: TestInterface<R>.() -> kotlin.Unit): R
 public fun test(): kotlin.Unit
 
 public interface TestInterface</*0*/ R> {
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/skipedUnresolvedInBuilderInferenceWithStubReceiverType.kt b/compiler/testData/diagnostics/tests/inference/builderInference/skipedUnresolvedInBuilderInferenceWithStubReceiverType.kt
index 45f67e5cb28..264457e50bd 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/skipedUnresolvedInBuilderInferenceWithStubReceiverType.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/skipedUnresolvedInBuilderInferenceWithStubReceiverType.kt
@@ -5,7 +5,7 @@
 import kotlin.experimental.ExperimentalTypeInference
 
 @OptIn(ExperimentalTypeInference::class)
-fun <T> foo(x: T, @BuilderInference builder: T.() -> Unit): Unit = TODO()
+fun <T> foo(x: T, builder: T.() -> Unit): Unit = TODO()
 
 class Bar<T>
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/skipedUnresolvedInBuilderInferenceWithStubReceiverType.txt b/compiler/testData/diagnostics/tests/inference/builderInference/skipedUnresolvedInBuilderInferenceWithStubReceiverType.txt
index b0b700c7316..3bee519b086 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/skipedUnresolvedInBuilderInferenceWithStubReceiverType.txt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/skipedUnresolvedInBuilderInferenceWithStubReceiverType.txt
@@ -1,6 +1,6 @@
 package
 
-@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ T> foo(/*0*/ x: T, /*1*/ @kotlin.BuilderInference builder: T.() -> kotlin.Unit): kotlin.Unit
+@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ T> foo(/*0*/ x: T, /*1*/ builder: T.() -> kotlin.Unit): kotlin.Unit
 public fun test(): kotlin.Unit
 
 public final class Bar</*0*/ T> {
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferences.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferences.fir.kt
index 69eb2ee59b6..80704d628da 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferences.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferences.fir.kt
@@ -30,7 +30,7 @@ fun foo7() = null as Foo7<Int>
 
 interface FlowCollector<in T> {}
 
-fun <L> flow(@BuilderInference block: suspend FlowCollector<L>.() -> Unit): Flow<L> = Flow(block)
+fun <L> flow(block: suspend FlowCollector<L>.() -> Unit): Flow<L> = Flow(block)
 
 class Flow<out R>(private val block: suspend FlowCollector<R>.() -> Unit)
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferences.kt b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferences.kt
index 333a036ce86..14a7815a728 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferences.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferences.kt
@@ -30,7 +30,7 @@ fun foo7() = null as Foo7<Int>
 
 interface FlowCollector<in T> {}
 
-fun <L> flow(@BuilderInference block: suspend FlowCollector<L>.() -> Unit): Flow<L> = Flow(block)
+fun <L> flow(block: suspend FlowCollector<L>.() -> Unit): Flow<L> = Flow(block)
 
 class Flow<out R>(private val block: suspend FlowCollector<R>.() -> Unit)
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesDontCareTypeInBlockExression.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesDontCareTypeInBlockExression.fir.kt
index 89d59f01493..8a7000fc751 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesDontCareTypeInBlockExression.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesDontCareTypeInBlockExression.fir.kt
@@ -30,7 +30,7 @@ fun foo7() = null as Foo7<Int>
 
 interface FlowCollector<in T> {}
 
-fun <L> flow(@BuilderInference block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
+fun <L> flow(block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
 
 class Flow<out R>(private val block: suspend FlowCollector<R>.() -> Unit)
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesDontCareTypeInBlockExression.kt b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesDontCareTypeInBlockExression.kt
index 4998d2f22f5..3bc201dc9bc 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesDontCareTypeInBlockExression.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesDontCareTypeInBlockExression.kt
@@ -30,7 +30,7 @@ fun foo7() = null as Foo7<Int>
 
 interface FlowCollector<in T> {}
 
-fun <L> flow(@BuilderInference block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
+fun <L> flow(block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
 
 class Flow<out R>(private val block: suspend FlowCollector<R>.() -> Unit)
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesDontRewriteAtSlice.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesDontRewriteAtSlice.fir.kt
index a911d2da861..586d14baba0 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesDontRewriteAtSlice.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesDontRewriteAtSlice.fir.kt
@@ -30,7 +30,7 @@ fun foo7() = null as Foo7<Int>
 
 interface FlowCollector<in T> {}
 
-fun <L> flow(@BuilderInference block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
+fun <L> flow(block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
 
 class Flow<out R>(private val block: suspend FlowCollector<R>.() -> Unit)
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesDontRewriteAtSlice.kt b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesDontRewriteAtSlice.kt
index 9f1f66c2b11..8655b3e78d6 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesDontRewriteAtSlice.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesDontRewriteAtSlice.kt
@@ -30,7 +30,7 @@ fun foo7() = null as Foo7<Int>
 
 interface FlowCollector<in T> {}
 
-fun <L> flow(@BuilderInference block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
+fun <L> flow(block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
 
 class Flow<out R>(private val block: suspend FlowCollector<R>.() -> Unit)
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesErrorType.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesErrorType.fir.kt
index 8b812f175b9..da79c374535 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesErrorType.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesErrorType.fir.kt
@@ -30,7 +30,7 @@ fun foo7() = null as Foo7<Int>
 
 interface FlowCollector<in T> {}
 
-fun <L> flow(@BuilderInference block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
+fun <L> flow(block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
 
 class Flow<out R>(private val block: suspend FlowCollector<R>.() -> Unit)
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesErrorType.kt b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesErrorType.kt
index e7768d436a3..d51fac922f6 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesErrorType.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesErrorType.kt
@@ -30,7 +30,7 @@ fun foo7() = null as Foo7<Int>
 
 interface FlowCollector<in T> {}
 
-fun <L> flow(@BuilderInference block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
+fun <L> flow(block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
 
 class Flow<out R>(private val block: suspend FlowCollector<R>.() -> Unit)
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesErrorTypeUnrestricted.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesErrorTypeUnrestricted.fir.kt
index fd772ed4359..a4d7d23fdce 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesErrorTypeUnrestricted.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesErrorTypeUnrestricted.fir.kt
@@ -31,7 +31,7 @@ fun foo7() = null as Foo7<Int>
 
 interface FlowCollector<in T> {}
 
-fun <L> flow(@BuilderInference block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
+fun <L> flow(block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
 
 class Flow<out R>(private val block: suspend FlowCollector<R>.() -> Unit)
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesErrorTypeUnrestricted.kt b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesErrorTypeUnrestricted.kt
index e1330bc67e9..cc21d7b9aaa 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesErrorTypeUnrestricted.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesErrorTypeUnrestricted.kt
@@ -31,7 +31,7 @@ fun foo7() = null as Foo7<Int>
 
 interface FlowCollector<in T> {}
 
-fun <L> flow(@BuilderInference block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
+fun <L> flow(block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
 
 class Flow<out R>(private val block: suspend FlowCollector<R>.() -> Unit)
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesNonStrictOnlyInputTypes.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesNonStrictOnlyInputTypes.fir.kt
index 6b3853bd09b..33695387e0f 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesNonStrictOnlyInputTypes.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesNonStrictOnlyInputTypes.fir.kt
@@ -16,7 +16,7 @@ var foo4: Float
 
 interface FlowCollector<in T> {}
 
-fun <L> flow(@BuilderInference block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
+fun <L> flow(block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
 
 class Flow<out R>(private val block: suspend FlowCollector<R>.() -> Unit)
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesNonStrictOnlyInputTypes.kt b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesNonStrictOnlyInputTypes.kt
index c58b6046537..f001ea20f1f 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesNonStrictOnlyInputTypes.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesNonStrictOnlyInputTypes.kt
@@ -16,7 +16,7 @@ var foo4: Float
 
 interface FlowCollector<in T> {}
 
-fun <L> flow(@BuilderInference block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
+fun <L> flow(block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
 
 class Flow<out R>(private val block: suspend FlowCollector<R>.() -> Unit)
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesUnrestricted.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesUnrestricted.fir.kt
index a9be6f377d3..87ee7c64135 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesUnrestricted.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesUnrestricted.fir.kt
@@ -32,7 +32,7 @@ fun foo7() = null as Foo7<Int>
 
 interface FlowCollector<in T> {}
 
-fun <L> flow(@BuilderInference block: suspend FlowCollector<L>.() -> Unit): Flow<L> = Flow(block)
+fun <L> flow(block: suspend FlowCollector<L>.() -> Unit): Flow<L> = Flow(block)
 
 class Flow<out R>(private val block: suspend FlowCollector<R>.() -> Unit)
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesUnrestricted.kt b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesUnrestricted.kt
index 5ab7b2376a8..48b351e5bdf 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesUnrestricted.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesUnrestricted.kt
@@ -32,7 +32,7 @@ fun foo7() = null as Foo7<Int>
 
 interface FlowCollector<in T> {}
 
-fun <L> flow(@BuilderInference block: suspend FlowCollector<L>.() -> Unit): Flow<L> = Flow(block)
+fun <L> flow(block: suspend FlowCollector<L>.() -> Unit): Flow<L> = Flow(block)
 
 class Flow<out R>(private val block: suspend FlowCollector<R>.() -> Unit)
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithLambdas.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithLambdas.fir.kt
index 1bdc8042118..97011acaaf3 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithLambdas.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithLambdas.fir.kt
@@ -6,7 +6,7 @@ import kotlin.experimental.ExperimentalTypeInference
 
 interface FlowCollector<in T> {}
 
-fun <L> flow(@BuilderInference block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
+fun <L> flow(block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
 
 class Flow<out R>(private val block: suspend FlowCollector<R>.() -> Unit)
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithLambdas.kt b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithLambdas.kt
index b84a208018e..d4915287750 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithLambdas.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithLambdas.kt
@@ -6,7 +6,7 @@ import kotlin.experimental.ExperimentalTypeInference
 
 interface FlowCollector<in T> {}
 
-fun <L> flow(@BuilderInference block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
+fun <L> flow(block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
 
 class Flow<out R>(private val block: suspend FlowCollector<R>.() -> Unit)
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/capturedTypes.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/capturedTypes.fir.kt
index 1e6d6462650..2f277f0f465 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/capturedTypes.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/capturedTypes.fir.kt
@@ -6,10 +6,10 @@
 import kotlin.experimental.ExperimentalTypeInference
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R> build(@BuilderInference block: TestInterface<R>.() -> Unit): R = TODO()
+fun <R> build(block: TestInterface<R>.() -> Unit): R = TODO()
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R> build2(@BuilderInference block: TestInterface<R>.() -> Unit): R = TODO()
+fun <R> build2(block: TestInterface<R>.() -> Unit): R = TODO()
 
 interface TestInterface<R> {
     fun emit(r: R)
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/capturedTypes.kt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/capturedTypes.kt
index 34d70b92de7..1545a713855 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/capturedTypes.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/capturedTypes.kt
@@ -6,10 +6,10 @@
 import kotlin.experimental.ExperimentalTypeInference
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R> build(@BuilderInference block: TestInterface<R>.() -> Unit): R = TODO()
+fun <R> build(block: TestInterface<R>.() -> Unit): R = TODO()
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R> build2(@BuilderInference block: TestInterface<R>.() -> Unit): R = TODO()
+fun <R> build2(block: TestInterface<R>.() -> Unit): R = TODO()
 
 interface TestInterface<R> {
     fun emit(r: R)
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/capturedTypes.txt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/capturedTypes.txt
index 2ce5ffa5eb6..22bd479d508 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/capturedTypes.txt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/capturedTypes.txt
@@ -1,7 +1,7 @@
 package
 
-@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ R> build(/*0*/ @kotlin.BuilderInference block: TestInterface<R>.() -> kotlin.Unit): R
-@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ R> build2(/*0*/ @kotlin.BuilderInference block: TestInterface<R>.() -> kotlin.Unit): R
+@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ R> build(/*0*/ block: TestInterface<R>.() -> kotlin.Unit): R
+@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ R> build2(/*0*/ block: TestInterface<R>.() -> kotlin.Unit): R
 public fun </*0*/ K> capture(/*0*/ x: Inv<K>): K
 public fun </*0*/ K> captureIn(/*0*/ x: Inv<out K>): K
 public fun </*0*/ K> captureOut(/*0*/ x: Inv<out K>): K
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperType.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperType.fir.kt
index 6db309e0506..328956b924f 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperType.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperType.fir.kt
@@ -12,10 +12,10 @@ class Test {
 import kotlin.experimental.ExperimentalTypeInference
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R> build(@BuilderInference block: TestInterface<R>.() -> Unit): R = TODO()
+fun <R> build(block: TestInterface<R>.() -> Unit): R = TODO()
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R> build2(@BuilderInference block: TestInterface<R>.() -> Unit): R = TODO()
+fun <R> build2(block: TestInterface<R>.() -> Unit): R = TODO()
 
 class Inv<K>
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperType.kt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperType.kt
index c00b5d0e24e..e6906e50afa 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperType.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperType.kt
@@ -12,10 +12,10 @@ class Test {
 import kotlin.experimental.ExperimentalTypeInference
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R> build(@BuilderInference block: TestInterface<R>.() -> Unit): R = TODO()
+fun <R> build(block: TestInterface<R>.() -> Unit): R = TODO()
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R> build2(@BuilderInference block: TestInterface<R>.() -> Unit): R = TODO()
+fun <R> build2(block: TestInterface<R>.() -> Unit): R = TODO()
 
 class Inv<K>
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperType.txt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperType.txt
index f28de25d7cf..186c05aa63f 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperType.txt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperType.txt
@@ -1,7 +1,7 @@
 package
 
-@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ R> build(/*0*/ @kotlin.BuilderInference block: TestInterface<R>.() -> kotlin.Unit): R
-@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ R> build2(/*0*/ @kotlin.BuilderInference block: TestInterface<R>.() -> kotlin.Unit): R
+@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ R> build(/*0*/ block: TestInterface<R>.() -> kotlin.Unit): R
+@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ R> build2(/*0*/ block: TestInterface<R>.() -> kotlin.Unit): R
 public fun </*0*/ U> id(/*0*/ x: U): U
 public fun </*0*/ E> select(/*0*/ vararg x: E /*kotlin.Array<out E>*/): E
 public fun test(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeContravariant.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeContravariant.fir.kt
index e1980d1a743..e9c4c7cc52b 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeContravariant.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeContravariant.fir.kt
@@ -12,10 +12,10 @@ class Test {
 import kotlin.experimental.ExperimentalTypeInference
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R1> build(@BuilderInference block: TestInterface<R1>.() -> Unit): R1 = TODO()
+fun <R1> build(block: TestInterface<R1>.() -> Unit): R1 = TODO()
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R2> build2(@BuilderInference block: TestInterface<R2>.() -> Unit): R2 = TODO()
+fun <R2> build2(block: TestInterface<R2>.() -> Unit): R2 = TODO()
 
 class In<in K>
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeContravariant.kt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeContravariant.kt
index 312c306726c..9ac82866d34 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeContravariant.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeContravariant.kt
@@ -12,10 +12,10 @@ class Test {
 import kotlin.experimental.ExperimentalTypeInference
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R1> build(@BuilderInference block: TestInterface<R1>.() -> Unit): R1 = TODO()
+fun <R1> build(block: TestInterface<R1>.() -> Unit): R1 = TODO()
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R2> build2(@BuilderInference block: TestInterface<R2>.() -> Unit): R2 = TODO()
+fun <R2> build2(block: TestInterface<R2>.() -> Unit): R2 = TODO()
 
 class In<in K>
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeContravariant.txt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeContravariant.txt
index 53b0f3a07b9..68b3f601ec5 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeContravariant.txt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeContravariant.txt
@@ -1,7 +1,7 @@
 package
 
-@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ R1> build(/*0*/ @kotlin.BuilderInference block: TestInterface<R1>.() -> kotlin.Unit): R1
-@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ R2> build2(/*0*/ @kotlin.BuilderInference block: TestInterface<R2>.() -> kotlin.Unit): R2
+@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ R1> build(/*0*/ block: TestInterface<R1>.() -> kotlin.Unit): R1
+@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ R2> build2(/*0*/ block: TestInterface<R2>.() -> kotlin.Unit): R2
 public fun </*0*/ U> id(/*0*/ x: U): U?
 public fun </*0*/ E> select1(/*0*/ x: E, /*1*/ y: In<E>): E?
 public fun </*0*/ E> select2(/*0*/ x: E, /*1*/ y: In<E?>): E
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeCovariant.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeCovariant.fir.kt
index 4d7a41dd0c6..d1fd795fef6 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeCovariant.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeCovariant.fir.kt
@@ -12,10 +12,10 @@ class Test {
 import kotlin.experimental.ExperimentalTypeInference
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R1> build(@BuilderInference block: TestInterface<R1>.() -> Unit): R1 = TODO()
+fun <R1> build(block: TestInterface<R1>.() -> Unit): R1 = TODO()
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R2> build2(@BuilderInference block: TestInterface<R2>.() -> Unit): R2 = TODO()
+fun <R2> build2(block: TestInterface<R2>.() -> Unit): R2 = TODO()
 
 class Out<out K>
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeCovariant.kt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeCovariant.kt
index 5ae6c00516f..11e5733030e 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeCovariant.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeCovariant.kt
@@ -12,10 +12,10 @@ class Test {
 import kotlin.experimental.ExperimentalTypeInference
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R1> build(@BuilderInference block: TestInterface<R1>.() -> Unit): R1 = TODO()
+fun <R1> build(block: TestInterface<R1>.() -> Unit): R1 = TODO()
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R2> build2(@BuilderInference block: TestInterface<R2>.() -> Unit): R2 = TODO()
+fun <R2> build2(block: TestInterface<R2>.() -> Unit): R2 = TODO()
 
 class Out<out K>
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeCovariant.txt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeCovariant.txt
index c88f9be0ef7..5848af37df9 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeCovariant.txt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeCovariant.txt
@@ -1,7 +1,7 @@
 package
 
-@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ R1> build(/*0*/ @kotlin.BuilderInference block: TestInterface<R1>.() -> kotlin.Unit): R1
-@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ R2> build2(/*0*/ @kotlin.BuilderInference block: TestInterface<R2>.() -> kotlin.Unit): R2
+@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ R1> build(/*0*/ block: TestInterface<R1>.() -> kotlin.Unit): R1
+@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ R2> build2(/*0*/ block: TestInterface<R2>.() -> kotlin.Unit): R2
 public fun </*0*/ U> id(/*0*/ x: U): U?
 public fun </*0*/ E> select1(/*0*/ x: E, /*1*/ y: Out<E>): E?
 public fun </*0*/ E> select2(/*0*/ x: E, /*1*/ y: Out<E?>): E
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeInvariant.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeInvariant.fir.kt
index 25ed73339ad..877abc4f9b8 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeInvariant.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeInvariant.fir.kt
@@ -12,10 +12,10 @@ class Test {
 import kotlin.experimental.ExperimentalTypeInference
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R1> build(@BuilderInference block: TestInterface<R1>.() -> Unit): R1 = TODO()
+fun <R1> build(block: TestInterface<R1>.() -> Unit): R1 = TODO()
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R2> build2(@BuilderInference block: TestInterface<R2>.() -> Unit): R2 = TODO()
+fun <R2> build2(block: TestInterface<R2>.() -> Unit): R2 = TODO()
 
 class Inv<K>
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeInvariant.kt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeInvariant.kt
index de963096356..eb362897913 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeInvariant.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeInvariant.kt
@@ -12,10 +12,10 @@ class Test {
 import kotlin.experimental.ExperimentalTypeInference
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R1> build(@BuilderInference block: TestInterface<R1>.() -> Unit): R1 = TODO()
+fun <R1> build(block: TestInterface<R1>.() -> Unit): R1 = TODO()
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R2> build2(@BuilderInference block: TestInterface<R2>.() -> Unit): R2 = TODO()
+fun <R2> build2(block: TestInterface<R2>.() -> Unit): R2 = TODO()
 
 class Inv<K>
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeInvariant.txt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeInvariant.txt
index b602a7a791c..f26a3d75ffe 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeInvariant.txt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeInvariant.txt
@@ -1,7 +1,7 @@
 package
 
-@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ R1> build(/*0*/ @kotlin.BuilderInference block: TestInterface<R1>.() -> kotlin.Unit): R1
-@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ R2> build2(/*0*/ @kotlin.BuilderInference block: TestInterface<R2>.() -> kotlin.Unit): R2
+@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ R1> build(/*0*/ block: TestInterface<R1>.() -> kotlin.Unit): R1
+@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ R2> build2(/*0*/ block: TestInterface<R2>.() -> kotlin.Unit): R2
 public fun </*0*/ U> id(/*0*/ x: U): U?
 public fun </*0*/ E> select1(/*0*/ x: E, /*1*/ y: Inv<E>): E?
 public fun </*0*/ E> select2(/*0*/ x: E, /*1*/ y: Inv<E?>): E
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeNullable.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeNullable.fir.kt
index c86b4ee9bd5..220c79bf8ae 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeNullable.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeNullable.fir.kt
@@ -15,10 +15,10 @@ class Test {
 import kotlin.experimental.ExperimentalTypeInference
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R> build(@BuilderInference block: TestInterface<R>.() -> Unit): R = TODO()
+fun <R> build(block: TestInterface<R>.() -> Unit): R = TODO()
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R> build2(@BuilderInference block: TestInterface<R>.() -> Unit): R = TODO()
+fun <R> build2(block: TestInterface<R>.() -> Unit): R = TODO()
 
 class Inv<K>
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeNullable.kt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeNullable.kt
index 4837649d60a..8af8237b075 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeNullable.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeNullable.kt
@@ -15,10 +15,10 @@ class Test {
 import kotlin.experimental.ExperimentalTypeInference
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R> build(@BuilderInference block: TestInterface<R>.() -> Unit): R = TODO()
+fun <R> build(block: TestInterface<R>.() -> Unit): R = TODO()
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R> build2(@BuilderInference block: TestInterface<R>.() -> Unit): R = TODO()
+fun <R> build2(block: TestInterface<R>.() -> Unit): R = TODO()
 
 class Inv<K>
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeNullable.txt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeNullable.txt
index a50e79c8f8d..18540b54b52 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeNullable.txt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeNullable.txt
@@ -1,7 +1,7 @@
 package
 
-@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ R> build(/*0*/ @kotlin.BuilderInference block: TestInterface<R>.() -> kotlin.Unit): R
-@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ R> build2(/*0*/ @kotlin.BuilderInference block: TestInterface<R>.() -> kotlin.Unit): R
+@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ R> build(/*0*/ block: TestInterface<R>.() -> kotlin.Unit): R
+@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ R> build2(/*0*/ block: TestInterface<R>.() -> kotlin.Unit): R
 public fun </*0*/ U> id(/*0*/ x: U): U?
 public fun </*0*/ E> select(/*0*/ vararg x: E /*kotlin.Array<out E>*/): E?
 public fun test(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/intersect.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/intersect.fir.kt
index 63ae5775b52..20fbfebaec0 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/intersect.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/intersect.fir.kt
@@ -12,10 +12,10 @@ class Test {
 import kotlin.experimental.ExperimentalTypeInference
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R1> build(@BuilderInference block: TestInterface<R1>.() -> Unit): R1 = TODO()
+fun <R1> build(block: TestInterface<R1>.() -> Unit): R1 = TODO()
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R2> build2(@BuilderInference block: TestInterface<R2>.() -> Unit): R2 = TODO()
+fun <R2> build2(block: TestInterface<R2>.() -> Unit): R2 = TODO()
 
 class In<in K>
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/intersect.kt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/intersect.kt
index 4b92674c263..903a9b09ff4 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/intersect.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/intersect.kt
@@ -12,10 +12,10 @@ class Test {
 import kotlin.experimental.ExperimentalTypeInference
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R1> build(@BuilderInference block: TestInterface<R1>.() -> Unit): R1 = TODO()
+fun <R1> build(block: TestInterface<R1>.() -> Unit): R1 = TODO()
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R2> build2(@BuilderInference block: TestInterface<R2>.() -> Unit): R2 = TODO()
+fun <R2> build2(block: TestInterface<R2>.() -> Unit): R2 = TODO()
 
 class In<in K>
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/intersect.txt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/intersect.txt
index c56982c82ac..4b38f93ec71 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/intersect.txt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/intersect.txt
@@ -1,7 +1,7 @@
 package
 
-@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ R1> build(/*0*/ @kotlin.BuilderInference block: TestInterface<R1>.() -> kotlin.Unit): R1
-@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ R2> build2(/*0*/ @kotlin.BuilderInference block: TestInterface<R2>.() -> kotlin.Unit): R2
+@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ R1> build(/*0*/ block: TestInterface<R1>.() -> kotlin.Unit): R1
+@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ R2> build2(/*0*/ block: TestInterface<R2>.() -> kotlin.Unit): R2
 public fun </*0*/ U> id(/*0*/ x: U): U
 public fun </*0*/ E> intersect(/*0*/ vararg x: In<E> /*kotlin.Array<out In<E>>*/): E
 public fun test(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/memberScope.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/memberScope.fir.kt
index 7e781212d4c..2eea7892597 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/memberScope.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/memberScope.fir.kt
@@ -11,7 +11,7 @@ interface TestInterface<R> {
 }
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R1> build(@BuilderInference block: TestInterface<R1>.() -> Unit): R1 = TODO()
+fun <R1> build(block: TestInterface<R1>.() -> Unit): R1 = TODO()
 
 fun Any.test() {}
 fun Any?.test2() {}
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/memberScope.kt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/memberScope.kt
index 137af28d325..821f280ae66 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/memberScope.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/memberScope.kt
@@ -11,7 +11,7 @@ interface TestInterface<R> {
 }
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R1> build(@BuilderInference block: TestInterface<R1>.() -> Unit): R1 = TODO()
+fun <R1> build(block: TestInterface<R1>.() -> Unit): R1 = TODO()
 
 fun Any.test() {}
 fun Any?.test2() {}
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/memberScope.txt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/memberScope.txt
index 74757fd1d8c..0e50fe97377 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/memberScope.txt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/memberScope.txt
@@ -1,6 +1,6 @@
 package
 
-@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ R1> build(/*0*/ @kotlin.BuilderInference block: TestInterface<R1>.() -> kotlin.Unit): R1
+@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ R1> build(/*0*/ block: TestInterface<R1>.() -> kotlin.Unit): R1
 public fun test(): kotlin.Unit
 public fun kotlin.Any.test(): kotlin.Unit
 public fun kotlin.Any?.test2(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/nullability.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/nullability.fir.kt
index f328fcb7cf1..133ad7932b0 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/nullability.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/nullability.fir.kt
@@ -11,16 +11,16 @@ interface TestInterface<R> {
 }
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R1> build(@BuilderInference block: TestInterface<R1>.() -> Unit): R1 = TODO()
+fun <R1> build(block: TestInterface<R1>.() -> Unit): R1 = TODO()
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R1 : Any> build2(@BuilderInference block: TestInterface<R1>.() -> Unit): R1 = TODO()
+fun <R1 : Any> build2(block: TestInterface<R1>.() -> Unit): R1 = TODO()
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R1 : R2, R2 : Any> build3(@BuilderInference block: TestInterface<R1>.() -> Unit): R1 = TODO()
+fun <R1 : R2, R2 : Any> build3(block: TestInterface<R1>.() -> Unit): R1 = TODO()
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R1 : R2, R2> build4(x: R2, @BuilderInference block: TestInterface<R1>.() -> Unit): R1 = TODO()
+fun <R1 : R2, R2> build4(x: R2, block: TestInterface<R1>.() -> Unit): R1 = TODO()
 
 fun test(a: String?) {
     val ret1 = build {
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/nullability.kt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/nullability.kt
index a2d9c8296c2..ee75aa7acb2 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/nullability.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/nullability.kt
@@ -11,16 +11,16 @@ interface TestInterface<R> {
 }
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R1> build(@BuilderInference block: TestInterface<R1>.() -> Unit): R1 = TODO()
+fun <R1> build(block: TestInterface<R1>.() -> Unit): R1 = TODO()
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R1 : Any> build2(@BuilderInference block: TestInterface<R1>.() -> Unit): R1 = TODO()
+fun <R1 : Any> build2(block: TestInterface<R1>.() -> Unit): R1 = TODO()
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R1 : R2, R2 : Any> build3(@BuilderInference block: TestInterface<R1>.() -> Unit): R1 = TODO()
+fun <R1 : R2, R2 : Any> build3(block: TestInterface<R1>.() -> Unit): R1 = TODO()
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R1 : R2, R2> build4(x: R2, @BuilderInference block: TestInterface<R1>.() -> Unit): R1 = TODO()
+fun <R1 : R2, R2> build4(x: R2, block: TestInterface<R1>.() -> Unit): R1 = TODO()
 
 fun test(a: String?) {
     val ret1 = build {
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/nullability.txt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/nullability.txt
index b6666359039..70ad9e47880 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/nullability.txt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/nullability.txt
@@ -1,9 +1,9 @@
 package
 
-@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ R1> build(/*0*/ @kotlin.BuilderInference block: TestInterface<R1>.() -> kotlin.Unit): R1
-@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ R1 : kotlin.Any> build2(/*0*/ @kotlin.BuilderInference block: TestInterface<R1>.() -> kotlin.Unit): R1
-@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ R1 : R2, /*1*/ R2 : kotlin.Any> build3(/*0*/ @kotlin.BuilderInference block: TestInterface<R1>.() -> kotlin.Unit): R1
-@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ R1 : R2, /*1*/ R2> build4(/*0*/ x: R2, /*1*/ @kotlin.BuilderInference block: TestInterface<R1>.() -> kotlin.Unit): R1
+@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ R1> build(/*0*/ block: TestInterface<R1>.() -> kotlin.Unit): R1
+@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ R1 : kotlin.Any> build2(/*0*/ block: TestInterface<R1>.() -> kotlin.Unit): R1
+@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ R1 : R2, /*1*/ R2 : kotlin.Any> build3(/*0*/ block: TestInterface<R1>.() -> kotlin.Unit): R1
+@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ R1 : R2, /*1*/ R2> build4(/*0*/ x: R2, /*1*/ block: TestInterface<R1>.() -> kotlin.Unit): R1
 public fun test(/*0*/ a: kotlin.String?): kotlin.Unit
 
 public interface TestInterface</*0*/ R> {
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/renderingStubTypes.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/renderingStubTypes.fir.kt
index 70bf44904db..8257cd27136 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/renderingStubTypes.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/renderingStubTypes.fir.kt
@@ -6,7 +6,7 @@ import kotlin.experimental.ExperimentalTypeInference
 
 @OptIn(ExperimentalTypeInference::class)
 fun <R> build(
-    @BuilderInference block: TestInterface<R>.() -> Unit
+    block: TestInterface<R>.() -> Unit
 ): R = TODO()
 
 class Inv<K>
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/renderingStubTypes.kt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/renderingStubTypes.kt
index b74c939e705..cdd87127b1d 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/renderingStubTypes.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/renderingStubTypes.kt
@@ -6,7 +6,7 @@ import kotlin.experimental.ExperimentalTypeInference
 
 @OptIn(ExperimentalTypeInference::class)
 fun <R> build(
-    @BuilderInference block: TestInterface<R>.() -> Unit
+    block: TestInterface<R>.() -> Unit
 ): R = TODO()
 
 class Inv<K>
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/renderingStubTypes.txt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/renderingStubTypes.txt
index 1a34195dc98..78874084ff3 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/renderingStubTypes.txt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/renderingStubTypes.txt
@@ -1,6 +1,6 @@
 package
 
-@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ R> build(/*0*/ @kotlin.BuilderInference block: TestInterface<R>.() -> kotlin.Unit): R
+@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ R> build(/*0*/ block: TestInterface<R>.() -> kotlin.Unit): R
 public fun </*0*/ U> id(/*0*/ x: U): U
 public fun test(): kotlin.Unit
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/builderInference/incorrectCalls.kt b/compiler/testData/diagnostics/testsWithStdLib/builderInference/incorrectCalls.kt
index 526b4c563d3..7e4923a5f8c 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/builderInference/incorrectCalls.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/builderInference/incorrectCalls.kt
@@ -15,7 +15,7 @@ class GenericController<T> {
     fun barReturnType(): T = TODO()
 }
 
-fun <S> generate(@BuilderInference g: suspend GenericController<S>.() -> Unit): List<S> = TODO()
+fun <S> generate(g: suspend GenericController<S>.() -> Unit): List<S> = TODO()
 
 val test1 = generate {
     yield(3)
diff --git a/compiler/testData/diagnostics/testsWithStdLib/builderInference/incorrectCalls.txt b/compiler/testData/diagnostics/testsWithStdLib/builderInference/incorrectCalls.txt
index aa1fb869364..cb114e9f144 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/builderInference/incorrectCalls.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/builderInference/incorrectCalls.txt
@@ -4,7 +4,7 @@ public val test1: kotlin.collections.List<kotlin.Int>
 public val test2: kotlin.collections.List<kotlin.Int>
 public val test3: kotlin.collections.List<kotlin.Int>
 public val test4: kotlin.collections.List<kotlin.Int>
-public fun </*0*/ S> generate(/*0*/ @kotlin.BuilderInference g: suspend GenericController<S>.() -> kotlin.Unit): kotlin.collections.List<S>
+public fun </*0*/ S> generate(/*0*/ g: suspend GenericController<S>.() -> kotlin.Unit): kotlin.collections.List<S>
 
 public final class GenericController</*0*/ T> {
     public constructor GenericController</*0*/ T>()
diff --git a/compiler/testData/diagnostics/testsWithStdLib/builderInference/incorrectCallsWithRestrictions.kt b/compiler/testData/diagnostics/testsWithStdLib/builderInference/incorrectCallsWithRestrictions.kt
index f80649f75b4..354b6fc21a6 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/builderInference/incorrectCallsWithRestrictions.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/builderInference/incorrectCallsWithRestrictions.kt
@@ -14,7 +14,7 @@ class GenericController<T> {
     fun barReturnType(): T = TODO()
 }
 
-fun <S> generate(@BuilderInference g: suspend GenericController<S>.() -> Unit): List<S> = TODO()
+fun <S> generate(g: suspend GenericController<S>.() -> Unit): List<S> = TODO()
 
 val test1 = generate {
     yield(3)
diff --git a/compiler/testData/diagnostics/testsWithStdLib/builderInference/incorrectCallsWithRestrictions.txt b/compiler/testData/diagnostics/testsWithStdLib/builderInference/incorrectCallsWithRestrictions.txt
index aa1fb869364..cb114e9f144 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/builderInference/incorrectCallsWithRestrictions.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/builderInference/incorrectCallsWithRestrictions.txt
@@ -4,7 +4,7 @@ public val test1: kotlin.collections.List<kotlin.Int>
 public val test2: kotlin.collections.List<kotlin.Int>
 public val test3: kotlin.collections.List<kotlin.Int>
 public val test4: kotlin.collections.List<kotlin.Int>
-public fun </*0*/ S> generate(/*0*/ @kotlin.BuilderInference g: suspend GenericController<S>.() -> kotlin.Unit): kotlin.collections.List<S>
+public fun </*0*/ S> generate(/*0*/ g: suspend GenericController<S>.() -> kotlin.Unit): kotlin.collections.List<S>
 
 public final class GenericController</*0*/ T> {
     public constructor GenericController</*0*/ T>()
diff --git a/compiler/testData/diagnostics/testsWithStdLib/builderInference/resolveUsualCallWithBuilderInference.kt b/compiler/testData/diagnostics/testsWithStdLib/builderInference/resolveUsualCallWithBuilderInference.kt
index 677ce2030fc..63df776af5a 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/builderInference/resolveUsualCallWithBuilderInference.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/builderInference/resolveUsualCallWithBuilderInference.kt
@@ -14,12 +14,11 @@ class Builder<T> {
     fun add(t: T) {}
 }
 
-fun <S> build(@BuilderInference g: Builder<S>.() -> Unit): List<S> = TODO()
+fun <S> build(g: Builder<S>.() -> Unit): List<S> = TODO()
 fun <S> wrongBuild(g: Builder<S>.() -> Unit): List<S> = TODO()
 
 fun <S> Builder<S>.extensionAdd(s: S) {}
 
-@BuilderInference
 fun <S> Builder<S>.safeExtensionAdd(s: S) {}
 
 val member = build {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/builderInference/resolveUsualCallWithBuilderInference.txt b/compiler/testData/diagnostics/testsWithStdLib/builderInference/resolveUsualCallWithBuilderInference.txt
index 5fb9bdce912..8a3f6d664a7 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/builderInference/resolveUsualCallWithBuilderInference.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/builderInference/resolveUsualCallWithBuilderInference.txt
@@ -4,10 +4,10 @@ public val extension: kotlin.collections.List<kotlin.String>
 public val member: kotlin.collections.List<kotlin.Int>
 public val memberWithoutAnn: kotlin.collections.List<kotlin.Int>
 public val safeExtension: kotlin.collections.List<kotlin.String>
-public fun </*0*/ S> build(/*0*/ @kotlin.BuilderInference g: Builder<S>.() -> kotlin.Unit): kotlin.collections.List<S>
+public fun </*0*/ S> build(/*0*/ g: Builder<S>.() -> kotlin.Unit): kotlin.collections.List<S>
 public fun </*0*/ S> wrongBuild(/*0*/ g: Builder<S>.() -> kotlin.Unit): kotlin.collections.List<S>
 public fun </*0*/ S> Builder<S>.extensionAdd(/*0*/ s: S): kotlin.Unit
-@kotlin.BuilderInference public fun </*0*/ S> Builder<S>.safeExtensionAdd(/*0*/ s: S): kotlin.Unit
+public fun </*0*/ S> Builder<S>.safeExtensionAdd(/*0*/ s: S): kotlin.Unit
 
 public final class Builder</*0*/ T> {
     public constructor Builder</*0*/ T>()
diff --git a/compiler/testData/diagnostics/testsWithStdLib/builderInference/resolveUsualCallWithBuilderInferenceWithRestrictions.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/builderInference/resolveUsualCallWithBuilderInferenceWithRestrictions.fir.kt
index 818332bb37d..3c09c1b7389 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/builderInference/resolveUsualCallWithBuilderInferenceWithRestrictions.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/builderInference/resolveUsualCallWithBuilderInferenceWithRestrictions.fir.kt
@@ -13,12 +13,11 @@ class Builder<T> {
     fun add(t: T) {}
 }
 
-fun <S> build(@BuilderInference g: Builder<S>.() -> Unit): List<S> = TODO()
+fun <S> build(g: Builder<S>.() -> Unit): List<S> = TODO()
 fun <S> wrongBuild(g: Builder<S>.() -> Unit): List<S> = TODO()
 
 fun <S> Builder<S>.extensionAdd(s: S) {}
 
-@BuilderInference
 fun <S> Builder<S>.safeExtensionAdd(s: S) {}
 
 val member = build {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/builderInference/resolveUsualCallWithBuilderInferenceWithRestrictions.kt b/compiler/testData/diagnostics/testsWithStdLib/builderInference/resolveUsualCallWithBuilderInferenceWithRestrictions.kt
index ed3741c1338..1633dab1f0d 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/builderInference/resolveUsualCallWithBuilderInferenceWithRestrictions.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/builderInference/resolveUsualCallWithBuilderInferenceWithRestrictions.kt
@@ -13,12 +13,11 @@ class Builder<T> {
     fun add(t: T) {}
 }
 
-fun <S> build(@BuilderInference g: Builder<S>.() -> Unit): List<S> = TODO()
+fun <S> build(g: Builder<S>.() -> Unit): List<S> = TODO()
 fun <S> wrongBuild(g: Builder<S>.() -> Unit): List<S> = TODO()
 
 fun <S> Builder<S>.extensionAdd(s: S) {}
 
-@BuilderInference
 fun <S> Builder<S>.safeExtensionAdd(s: S) {}
 
 val member = build {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/builderInference/resolveUsualCallWithBuilderInferenceWithRestrictions.txt b/compiler/testData/diagnostics/testsWithStdLib/builderInference/resolveUsualCallWithBuilderInferenceWithRestrictions.txt
index 5fb9bdce912..8a3f6d664a7 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/builderInference/resolveUsualCallWithBuilderInferenceWithRestrictions.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/builderInference/resolveUsualCallWithBuilderInferenceWithRestrictions.txt
@@ -4,10 +4,10 @@ public val extension: kotlin.collections.List<kotlin.String>
 public val member: kotlin.collections.List<kotlin.Int>
 public val memberWithoutAnn: kotlin.collections.List<kotlin.Int>
 public val safeExtension: kotlin.collections.List<kotlin.String>
-public fun </*0*/ S> build(/*0*/ @kotlin.BuilderInference g: Builder<S>.() -> kotlin.Unit): kotlin.collections.List<S>
+public fun </*0*/ S> build(/*0*/ g: Builder<S>.() -> kotlin.Unit): kotlin.collections.List<S>
 public fun </*0*/ S> wrongBuild(/*0*/ g: Builder<S>.() -> kotlin.Unit): kotlin.collections.List<S>
 public fun </*0*/ S> Builder<S>.extensionAdd(/*0*/ s: S): kotlin.Unit
-@kotlin.BuilderInference public fun </*0*/ S> Builder<S>.safeExtensionAdd(/*0*/ s: S): kotlin.Unit
+public fun </*0*/ S> Builder<S>.safeExtensionAdd(/*0*/ s: S): kotlin.Unit
 
 public final class Builder</*0*/ T> {
     public constructor Builder</*0*/ T>()
diff --git a/compiler/testData/diagnostics/testsWithStdLib/builderInference/useInferenceInformationFromExtension.kt b/compiler/testData/diagnostics/testsWithStdLib/builderInference/useInferenceInformationFromExtension.kt
index a6588a43bc9..69ffe0282d1 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/builderInference/useInferenceInformationFromExtension.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/builderInference/useInferenceInformationFromExtension.kt
@@ -17,10 +17,9 @@ class GenericController<T> {
 
 suspend fun <S> GenericController<S>.extensionYield(s: S) {}
 
-@BuilderInference
 suspend fun <S> GenericController<S>.safeExtensionYield(s: S) {}
 
-fun <S> generate(@BuilderInference g: suspend GenericController<S>.() -> Unit): List<S> = TODO()
+fun <S> generate(g: suspend GenericController<S>.() -> Unit): List<S> = TODO()
 
 val normal = generate {
     yield(42)
diff --git a/compiler/testData/diagnostics/testsWithStdLib/builderInference/useInferenceInformationFromExtension.txt b/compiler/testData/diagnostics/testsWithStdLib/builderInference/useInferenceInformationFromExtension.txt
index 9a2789c7e6e..f702b27ffe3 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/builderInference/useInferenceInformationFromExtension.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/builderInference/useInferenceInformationFromExtension.txt
@@ -3,9 +3,9 @@ package
 public val extension: kotlin.collections.List<kotlin.String>
 public val normal: kotlin.collections.List<kotlin.Int>
 public val safeExtension: kotlin.collections.List<kotlin.String>
-public fun </*0*/ S> generate(/*0*/ @kotlin.BuilderInference g: suspend GenericController<S>.() -> kotlin.Unit): kotlin.collections.List<S>
+public fun </*0*/ S> generate(/*0*/ g: suspend GenericController<S>.() -> kotlin.Unit): kotlin.collections.List<S>
 public suspend fun </*0*/ S> GenericController<S>.extensionYield(/*0*/ s: S): kotlin.Unit
-@kotlin.BuilderInference public suspend fun </*0*/ S> GenericController<S>.safeExtensionYield(/*0*/ s: S): kotlin.Unit
+public suspend fun </*0*/ S> GenericController<S>.safeExtensionYield(/*0*/ s: S): kotlin.Unit
 
 public final class GenericController</*0*/ T> {
     public constructor GenericController</*0*/ T>()
diff --git a/compiler/testData/diagnostics/testsWithStdLib/builderInference/useInferenceInformationFromExtensionWithRestrictions.kt b/compiler/testData/diagnostics/testsWithStdLib/builderInference/useInferenceInformationFromExtensionWithRestrictions.kt
index 55334c1ea83..0f830fe11b7 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/builderInference/useInferenceInformationFromExtensionWithRestrictions.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/builderInference/useInferenceInformationFromExtensionWithRestrictions.kt
@@ -16,10 +16,9 @@ class GenericController<T> {
 
 suspend fun <S> GenericController<S>.extensionYield(s: S) {}
 
-@BuilderInference
 suspend fun <S> GenericController<S>.safeExtensionYield(s: S) {}
 
-fun <S> generate(@BuilderInference g: suspend GenericController<S>.() -> Unit): List<S> = TODO()
+fun <S> generate(g: suspend GenericController<S>.() -> Unit): List<S> = TODO()
 
 val normal = generate {
     yield(42)
diff --git a/compiler/testData/diagnostics/testsWithStdLib/builderInference/useInferenceInformationFromExtensionWithRestrictions.txt b/compiler/testData/diagnostics/testsWithStdLib/builderInference/useInferenceInformationFromExtensionWithRestrictions.txt
index 9a2789c7e6e..f702b27ffe3 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/builderInference/useInferenceInformationFromExtensionWithRestrictions.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/builderInference/useInferenceInformationFromExtensionWithRestrictions.txt
@@ -3,9 +3,9 @@ package
 public val extension: kotlin.collections.List<kotlin.String>
 public val normal: kotlin.collections.List<kotlin.Int>
 public val safeExtension: kotlin.collections.List<kotlin.String>
-public fun </*0*/ S> generate(/*0*/ @kotlin.BuilderInference g: suspend GenericController<S>.() -> kotlin.Unit): kotlin.collections.List<S>
+public fun </*0*/ S> generate(/*0*/ g: suspend GenericController<S>.() -> kotlin.Unit): kotlin.collections.List<S>
 public suspend fun </*0*/ S> GenericController<S>.extensionYield(/*0*/ s: S): kotlin.Unit
-@kotlin.BuilderInference public suspend fun </*0*/ S> GenericController<S>.safeExtensionYield(/*0*/ s: S): kotlin.Unit
+public suspend fun </*0*/ S> GenericController<S>.safeExtensionYield(/*0*/ s: S): kotlin.Unit
 
 public final class GenericController</*0*/ T> {
     public constructor GenericController</*0*/ T>()
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/chainCallWithExtensionExplicitTypes.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/chainCallWithExtensionExplicitTypes.kt
index 5eb9b23e7d4..37627755b32 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/chainCallWithExtensionExplicitTypes.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/chainCallWithExtensionExplicitTypes.kt
@@ -14,7 +14,7 @@ class CoroutineScope
 class ReceiveChannel<E>
 
 @OptIn(ExperimentalTypeInference::class)
-public fun <E> produce(@BuilderInference block: suspend ProducerScope<E>.() -> Unit): ProducerScope<E> = TODO()
+public fun <E> produce(block: suspend ProducerScope<E>.() -> Unit): ProducerScope<E> = TODO()
 
 fun test(ls: List<Int>) =
     produce<Int> {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/chainCallWithExtensionExplicitTypes.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/chainCallWithExtensionExplicitTypes.txt
index 48566025776..335217f9dd6 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/chainCallWithExtensionExplicitTypes.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/chainCallWithExtensionExplicitTypes.txt
@@ -1,6 +1,6 @@
 package
 
-@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ E> produce(/*0*/ @kotlin.BuilderInference block: suspend ProducerScope<E>.() -> kotlin.Unit): ProducerScope<E>
+@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ E> produce(/*0*/ block: suspend ProducerScope<E>.() -> kotlin.Unit): ProducerScope<E>
 public fun test(/*0*/ ls: kotlin.collections.List<kotlin.Int>): ProducerScope<kotlin.Int>
 private fun </*0*/ E> kotlin.collections.Iterable<E>.asReceiveChannel(): ReceiveChannel<E>
 public suspend fun </*0*/ E, /*1*/ C> ReceiveChannel<E>.toChannel(/*0*/ destination: C): C
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/coroutineInferenceWithCapturedTypeVariable.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/coroutineInferenceWithCapturedTypeVariable.kt
index 50339cb5869..003cbe09722 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/coroutineInferenceWithCapturedTypeVariable.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/coroutineInferenceWithCapturedTypeVariable.kt
@@ -11,7 +11,7 @@ suspend fun main() {
 
 
 @OptIn(ExperimentalTypeInference::class)
-fun <K> iFlow(@BuilderInference block: suspend iFlowCollector<in K>.() -> Unit): iFlow<K> = TODO()
+fun <K> iFlow(block: suspend iFlowCollector<in K>.() -> Unit): iFlow<K> = TODO()
 
 interface iFlowCollector<S> {
     suspend fun emit(value: S)
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/coroutineInferenceWithCapturedTypeVariable.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/coroutineInferenceWithCapturedTypeVariable.txt
index b9fd3273e00..282ae8eca70 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/coroutineInferenceWithCapturedTypeVariable.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/coroutineInferenceWithCapturedTypeVariable.txt
@@ -1,6 +1,6 @@
 package
 
-@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ K> iFlow(/*0*/ @kotlin.BuilderInference block: suspend iFlowCollector<in K>.() -> kotlin.Unit): iFlow<K>
+@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ K> iFlow(/*0*/ block: suspend iFlowCollector<in K>.() -> kotlin.Unit): iFlow<K>
 public suspend fun main(): kotlin.Unit
 
 public interface iFlow</*0*/ out V> {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/correctMember.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/correctMember.kt
index 54dff05b779..23b7305e7c8 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/correctMember.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/correctMember.kt
@@ -14,7 +14,7 @@ interface Controller<T> {
     fun <Z> generidFun(t: Z) = t
 }
 
-fun <S> generate(@BuilderInference g: suspend Controller<S>.() -> Unit): S = TODO()
+fun <S> generate(g: suspend Controller<S>.() -> Unit): S = TODO()
 
 val test1 = generate {
     yield(justString())
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/correctMember.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/correctMember.txt
index 94cf52b9dcf..288fb4cac8e 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/correctMember.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/correctMember.txt
@@ -2,7 +2,7 @@ package
 
 public val test1: kotlin.String
 public val test2: kotlin.Int
-public fun </*0*/ S> generate(/*0*/ @kotlin.BuilderInference g: suspend Controller<S>.() -> kotlin.Unit): S
+public fun </*0*/ S> generate(/*0*/ g: suspend Controller<S>.() -> kotlin.Unit): S
 
 public interface Controller</*0*/ T> {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/doubleColonExpressionToClassWithParameters.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/doubleColonExpressionToClassWithParameters.kt
index c5f62bc46e9..aa7931feb96 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/doubleColonExpressionToClassWithParameters.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/doubleColonExpressionToClassWithParameters.kt
@@ -28,7 +28,7 @@ interface Scope<T> {
     fun yield(t: T) {}
 }
 
-fun <S> generate(@BuilderInference g: Scope<S>.() -> Unit): S = TODO()
+fun <S> generate(g: Scope<S>.() -> Unit): S = TODO()
 
 val test2 = generate {
     { yield("foo") }::class
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/doubleColonExpressionToClassWithParameters.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/doubleColonExpressionToClassWithParameters.txt
index 7d0e993043d..3780a6c3847 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/doubleColonExpressionToClassWithParameters.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/doubleColonExpressionToClassWithParameters.txt
@@ -5,7 +5,7 @@ package a {
     package a.b {
         public val test2: kotlin.String
         public val test3: kotlin.String
-        public fun </*0*/ S> generate(/*0*/ @kotlin.BuilderInference g: a.b.Scope<S>.() -> kotlin.Unit): S
+        public fun </*0*/ S> generate(/*0*/ g: a.b.Scope<S>.() -> kotlin.Unit): S
         public fun test1(): kotlin.Unit
 
         public final class BatchInfo1 {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionPriority.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionPriority.kt
index 1879433c4e4..ff29234433a 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionPriority.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionPriority.kt
@@ -8,12 +8,10 @@ import kotlin.experimental.ExperimentalTypeInference
 
 class GenericController<T>
 
-@BuilderInference
 suspend fun <S> GenericController<S>.yieldAll(s: Collection<S>): String = ""
-@BuilderInference
 suspend fun <S> GenericController<S>.yieldAll(s: Set<S>): Int = 4
 
-fun <T, R> generate(@BuilderInference g: suspend GenericController<T>.() -> R): Pair<T, R> = TODO()
+fun <T, R> generate(g: suspend GenericController<T>.() -> R): Pair<T, R> = TODO()
 
 val test1 = generate {
     yieldAll(setOf(4))
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionPriority.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionPriority.txt
index f7f1c393be5..edf07576028 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionPriority.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionPriority.txt
@@ -2,11 +2,11 @@ package
 
 public val test1: Pair<kotlin.Int, kotlin.Int>
 public val test2: Pair<kotlin.Int, kotlin.String>
-public fun </*0*/ T, /*1*/ R> generate(/*0*/ @kotlin.BuilderInference g: suspend GenericController<T>.() -> R): Pair<T, R>
+public fun </*0*/ T, /*1*/ R> generate(/*0*/ g: suspend GenericController<T>.() -> R): Pair<T, R>
 public fun </*0*/ X> listOf(/*0*/ vararg x: X /*kotlin.Array<out X>*/): kotlin.collections.List<X>
 public fun </*0*/ X> setOf(/*0*/ vararg x: X /*kotlin.Array<out X>*/): kotlin.collections.Set<X>
-@kotlin.BuilderInference public suspend fun </*0*/ S> GenericController<S>.yieldAll(/*0*/ s: kotlin.collections.Collection<S>): kotlin.String
-@kotlin.BuilderInference public suspend fun </*0*/ S> GenericController<S>.yieldAll(/*0*/ s: kotlin.collections.Set<S>): kotlin.Int
+public suspend fun </*0*/ S> GenericController<S>.yieldAll(/*0*/ s: kotlin.collections.Collection<S>): kotlin.String
+public suspend fun </*0*/ S> GenericController<S>.yieldAll(/*0*/ s: kotlin.collections.Set<S>): kotlin.Int
 
 public final class GenericController</*0*/ T> {
     public constructor GenericController</*0*/ T>()
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionSuspend.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionSuspend.kt
index 5d9bd24b5cd..afff9cd9739 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionSuspend.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionSuspend.kt
@@ -10,10 +10,9 @@ class GenericController<T> {
     suspend fun yield(t: T) {}
 }
 
-@BuilderInference
 suspend fun <K> GenericController<K>.yieldAll(s: Collection<K>) {}
 
-fun <S> generate(@BuilderInference g: suspend GenericController<S>.() -> Unit): S = TODO()
+fun <S> generate(g: suspend GenericController<S>.() -> Unit): S = TODO()
 
 val test1 = generate {
     yield(4)
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionSuspend.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionSuspend.txt
index 52a24452e13..b1212a4de77 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionSuspend.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionSuspend.txt
@@ -4,9 +4,9 @@ public val test1: kotlin.Int
 public val test2: B
 public val test3: A
 public val test4: A
-public fun </*0*/ S> generate(/*0*/ @kotlin.BuilderInference g: suspend GenericController<S>.() -> kotlin.Unit): S
+public fun </*0*/ S> generate(/*0*/ g: suspend GenericController<S>.() -> kotlin.Unit): S
 public fun </*0*/ X> setOf(/*0*/ vararg x: X /*kotlin.Array<out X>*/): kotlin.collections.Set<X>
-@kotlin.BuilderInference public suspend fun </*0*/ K> GenericController<K>.yieldAll(/*0*/ s: kotlin.collections.Collection<K>): kotlin.Unit
+public suspend fun </*0*/ K> GenericController<K>.yieldAll(/*0*/ s: kotlin.collections.Collection<K>): kotlin.Unit
 
 public interface A {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionWithNonValuableConstraints.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionWithNonValuableConstraints.fir.kt
index 9756946f13b..c5dd98d7c5d 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionWithNonValuableConstraints.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionWithNonValuableConstraints.fir.kt
@@ -12,7 +12,7 @@ interface Controller<T> : Base {
     suspend fun yield(t: T) {}
 }
 
-fun <S> generate(@BuilderInference g: suspend Controller<S>.() -> Unit): S = TODO()
+fun <S> generate(g: suspend Controller<S>.() -> Unit): S = TODO()
 
 fun Base.baseExtension() {}
 fun Controller<out Any?>.outNullableAnyExtension() {}
@@ -20,7 +20,6 @@ fun Controller<out Any>.outAnyExtension() {}
 fun Controller<Any?>.invNullableAnyExtension() {}
 fun <S> Controller<S>.genericExtension() {}
 
-@BuilderInference
 fun Controller<String>.safeExtension() {}
 
 val test1 = generate {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionWithNonValuableConstraints.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionWithNonValuableConstraints.kt
index b2557ffd215..da9ed1e5248 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionWithNonValuableConstraints.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionWithNonValuableConstraints.kt
@@ -12,7 +12,7 @@ interface Controller<T> : Base {
     suspend fun yield(t: T) {}
 }
 
-fun <S> generate(@BuilderInference g: suspend Controller<S>.() -> Unit): S = TODO()
+fun <S> generate(g: suspend Controller<S>.() -> Unit): S = TODO()
 
 fun Base.baseExtension() {}
 fun Controller<out Any?>.outNullableAnyExtension() {}
@@ -20,7 +20,6 @@ fun Controller<out Any>.outAnyExtension() {}
 fun Controller<Any?>.invNullableAnyExtension() {}
 fun <S> Controller<S>.genericExtension() {}
 
-@BuilderInference
 fun Controller<String>.safeExtension() {}
 
 val test1 = generate {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionWithNonValuableConstraints.ni.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionWithNonValuableConstraints.ni.txt
index 0972b686d7f..5f6829347aa 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionWithNonValuableConstraints.ni.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionWithNonValuableConstraints.ni.txt
@@ -10,13 +10,13 @@ public val test5: kotlin.Int
 public val test6: kotlin.Any?
 public val test7: kotlin.Int
 public val test8: kotlin.String
-public fun </*0*/ S> generate(/*0*/ @kotlin.BuilderInference g: suspend Controller<S>.() -> kotlin.Unit): S
+public fun </*0*/ S> generate(/*0*/ g: suspend Controller<S>.() -> kotlin.Unit): S
 public fun Base.baseExtension(): kotlin.Unit
 public fun </*0*/ S> Controller<S>.genericExtension(): kotlin.Unit
 public fun Controller<kotlin.Any?>.invNullableAnyExtension(): kotlin.Unit
 public fun Controller<out kotlin.Any>.outAnyExtension(): kotlin.Unit
 public fun Controller<out kotlin.Any?>.outNullableAnyExtension(): kotlin.Unit
-@kotlin.BuilderInference public fun Controller<kotlin.String>.safeExtension(): kotlin.Unit
+public fun Controller<kotlin.String>.safeExtension(): kotlin.Unit
 
 public interface Base {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionWithNonValuableConstraints.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionWithNonValuableConstraints.txt
index 626486cc23a..db041bc04a2 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionWithNonValuableConstraints.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionWithNonValuableConstraints.txt
@@ -21,13 +21,13 @@ public val test7: [ERROR : Type for generate {
     genericExtension<Int>()
 }]
 public val test8: kotlin.String
-public fun </*0*/ S> generate(/*0*/ @kotlin.BuilderInference g: suspend Controller<S>.() -> kotlin.Unit): S
+public fun </*0*/ S> generate(/*0*/ g: suspend Controller<S>.() -> kotlin.Unit): S
 public fun Base.baseExtension(): kotlin.Unit
 public fun </*0*/ S> Controller<S>.genericExtension(): kotlin.Unit
 public fun Controller<kotlin.Any?>.invNullableAnyExtension(): kotlin.Unit
 public fun Controller<out kotlin.Any>.outAnyExtension(): kotlin.Unit
 public fun Controller<out kotlin.Any?>.outNullableAnyExtension(): kotlin.Unit
-@kotlin.BuilderInference public fun Controller<kotlin.String>.safeExtension(): kotlin.Unit
+public fun Controller<kotlin.String>.safeExtension(): kotlin.Unit
 
 public interface Base {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionsWithNonValuableConstraintsGenericBase.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionsWithNonValuableConstraintsGenericBase.kt
index a16558bb422..6d81a261b8e 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionsWithNonValuableConstraintsGenericBase.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionsWithNonValuableConstraintsGenericBase.kt
@@ -17,8 +17,8 @@ interface SpecificController<T> : Base<String> {
     suspend fun yield(t: T) {}
 }
 
-fun <S> generate(@BuilderInference g: suspend Controller<S>.() -> Unit): S = TODO()
-fun <S> generateSpecific(@BuilderInference g: suspend SpecificController<S>.() -> Unit): S = TODO()
+fun <S> generate(g: suspend Controller<S>.() -> Unit): S = TODO()
+fun <S> generateSpecific(g: suspend SpecificController<S>.() -> Unit): S = TODO()
 
 fun Base<*>.starBase() {}
 fun Base<String>.stringBase() {}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionsWithNonValuableConstraintsGenericBase.ni.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionsWithNonValuableConstraintsGenericBase.ni.txt
index e76daded9af..9a3d74fc2fb 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionsWithNonValuableConstraintsGenericBase.ni.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionsWithNonValuableConstraintsGenericBase.ni.txt
@@ -10,8 +10,8 @@ public val test5: kotlin.Int
 public val test6: [Error type: Not found recorded type for generateSpecific {
     stringBase()
 }]
-public fun </*0*/ S> generate(/*0*/ @kotlin.BuilderInference g: suspend Controller<S>.() -> kotlin.Unit): S
-public fun </*0*/ S> generateSpecific(/*0*/ @kotlin.BuilderInference g: suspend SpecificController<S>.() -> kotlin.Unit): S
+public fun </*0*/ S> generate(/*0*/ g: suspend Controller<S>.() -> kotlin.Unit): S
+public fun </*0*/ S> generateSpecific(/*0*/ g: suspend SpecificController<S>.() -> kotlin.Unit): S
 public fun Base<*>.starBase(): kotlin.Unit
 public fun Base<kotlin.String>.stringBase(): kotlin.Unit
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionsWithNonValuableConstraintsGenericBase.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionsWithNonValuableConstraintsGenericBase.txt
index 4fb14b3ccda..20ec26b00da 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionsWithNonValuableConstraintsGenericBase.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionsWithNonValuableConstraintsGenericBase.txt
@@ -13,8 +13,8 @@ public val test5: kotlin.Int
 public val test6: [ERROR : Type for generateSpecific {
     stringBase()
 }]
-public fun </*0*/ S> generate(/*0*/ @kotlin.BuilderInference g: suspend Controller<S>.() -> kotlin.Unit): S
-public fun </*0*/ S> generateSpecific(/*0*/ @kotlin.BuilderInference g: suspend SpecificController<S>.() -> kotlin.Unit): S
+public fun </*0*/ S> generate(/*0*/ g: suspend Controller<S>.() -> kotlin.Unit): S
+public fun </*0*/ S> generateSpecific(/*0*/ g: suspend SpecificController<S>.() -> kotlin.Unit): S
 public fun Base<*>.starBase(): kotlin.Unit
 public fun Base<kotlin.String>.stringBase(): kotlin.Unit
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/inferenceFromMethodInsideLocalVariable.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/inferenceFromMethodInsideLocalVariable.kt
index dd2aa038cd8..db9cecf9bf7 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/inferenceFromMethodInsideLocalVariable.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/inferenceFromMethodInsideLocalVariable.kt
@@ -9,7 +9,7 @@ interface Inv<T> {
 }
 
 @OptIn(ExperimentalTypeInference::class)
-fun <K> foo(@BuilderInference block: Inv<K>.() -> Unit) {}
+fun <K> foo(block: Inv<K>.() -> Unit) {}
 
 fun test(i: Int) {
     foo {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/inferenceFromMethodInsideLocalVariable.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/inferenceFromMethodInsideLocalVariable.txt
index c5ef7968688..853eb480a32 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/inferenceFromMethodInsideLocalVariable.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/inferenceFromMethodInsideLocalVariable.txt
@@ -1,6 +1,6 @@
 package
 
-@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ K> foo(/*0*/ @kotlin.BuilderInference block: Inv<K>.() -> kotlin.Unit): kotlin.Unit
+@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ K> foo(/*0*/ block: Inv<K>.() -> kotlin.Unit): kotlin.Unit
 public fun test(/*0*/ i: kotlin.Int): kotlin.Unit
 
 public interface Inv</*0*/ T> {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt32097.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt32097.kt
index 4f717fb7d46..ad248d1a1c4 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt32097.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt32097.kt
@@ -14,7 +14,7 @@ interface Flow<out T> {
 }
 
 @OptIn(ExperimentalTypeInference::class)
-fun <T> channelFlow(@BuilderInference block: suspend ProducerScope<T>.() -> Unit): Flow<T> = TODO()
+fun <T> channelFlow(block: suspend ProducerScope<T>.() -> Unit): Flow<T> = TODO()
 
 interface ProducerScope<in E>
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt32097.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt32097.txt
index 3d9f20a5432..2985129fa58 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt32097.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt32097.txt
@@ -1,7 +1,7 @@
 package
 
 public fun aFlow(): Flow<kotlin.Unit>
-@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ T> channelFlow(/*0*/ @kotlin.BuilderInference block: suspend ProducerScope<T>.() -> kotlin.Unit): Flow<T>
+@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ T> channelFlow(/*0*/ block: suspend ProducerScope<T>.() -> kotlin.Unit): Flow<T>
 public suspend fun ProducerScope<*>.awaitClose(/*0*/ block: () -> kotlin.Unit = ...): kotlin.Unit
 
 public interface Flow</*0*/ out T> {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt32203.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt32203.kt
index 00444e502f8..092ee3b5674 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt32203.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt32203.kt
@@ -8,7 +8,7 @@ class Buildee<T>
 class Builder<T>
 
 @OptIn(ExperimentalTypeInference::class)
-inline fun <T> builder(@BuilderInference block: Builder<T>.() -> Unit): Buildee<T> = TODO()
+inline fun <T> builder(block: Builder<T>.() -> Unit): Buildee<T> = TODO()
 
 private fun <T> Builder<T>.consumer(builder: Builder<T>): Unit = TODO()
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt32203.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt32203.txt
index a7e96363433..5072a2fdddd 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt32203.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt32203.txt
@@ -1,6 +1,6 @@
 package
 
-@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public inline fun </*0*/ T> builder(/*0*/ @kotlin.BuilderInference block: Builder<T>.() -> kotlin.Unit): Buildee<T>
+@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public inline fun </*0*/ T> builder(/*0*/ block: Builder<T>.() -> kotlin.Unit): Buildee<T>
 private fun </*0*/ T> Builder<T>.consumer(/*0*/ builder: Builder<T>): kotlin.Unit
 public fun </*0*/ T> Builder<T>.foo(): Buildee<T>
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt33542.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt33542.kt
index 2de10a52c61..8a26d2389b4 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt33542.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt33542.kt
@@ -13,7 +13,7 @@ class InImpl<E> : In<E> {
 }
 
 @OptIn(ExperimentalTypeInference::class)
-public fun <T> builder(@BuilderInference block: In<T>.() -> Unit) {
+public fun <T> builder(block: In<T>.() -> Unit) {
     InImpl<T>().block()
 }
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt33542.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt33542.txt
index 34d7b36dfe2..9e7237b15bb 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt33542.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt33542.txt
@@ -1,6 +1,6 @@
 package
 
-@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ T> builder(/*0*/ @kotlin.BuilderInference block: In<T>.() -> kotlin.Unit): kotlin.Unit
+@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ T> builder(/*0*/ block: In<T>.() -> kotlin.Unit): kotlin.Unit
 public fun test(): kotlin.Unit
 public suspend fun yield(): kotlin.Unit
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt35306.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt35306.kt
index 72dc69b5c94..2f3d842878f 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt35306.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt35306.kt
@@ -8,7 +8,7 @@ import kotlin.experimental.ExperimentalTypeInference
 interface Build<T>
 
 @OptIn(ExperimentalTypeInference::class)
-fun <T> build(@BuilderInference fn: Builder<T>.() -> Unit): Build<T> = TODO()
+fun <T> build(fn: Builder<T>.() -> Unit): Build<T> = TODO()
 
 // Works completely
 val build = build {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt35306.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt35306.txt
index d0469da501f..970255cdd8a 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt35306.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt35306.txt
@@ -4,7 +4,7 @@ public val build: Build<kotlin.Int>
 public val buildWithFn: Build<kotlin.Int>
 public val buildWithFnWrapped: Build<kotlin.Int>
 public val buildWithWrappedValue: Build<kotlin.Int>
-@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ T> build(/*0*/ @kotlin.BuilderInference fn: Builder<T>.() -> kotlin.Unit): Build<T>
+@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ T> build(/*0*/ fn: Builder<T>.() -> kotlin.Unit): Build<T>
 
 public interface Build</*0*/ T> {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt35684.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt35684.fir.kt
index 645338b8cdf..a1aca0be910 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt35684.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt35684.fir.kt
@@ -26,7 +26,7 @@ fun test_3() {
 }
 
 @OptIn(ExperimentalTypeInference::class)
-fun <U> sequence(@BuilderInference block: suspend Inv<U>.() -> Unit): U = null!!
+fun <U> sequence(block: suspend Inv<U>.() -> Unit): U = null!!
 
 interface Inv<T> {
     fun yield(element: T)
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt35684.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt35684.kt
index e429bbacecd..2100d11cad7 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt35684.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt35684.kt
@@ -26,7 +26,7 @@ fun test_3() {
 }
 
 @OptIn(ExperimentalTypeInference::class)
-fun <U> sequence(@BuilderInference block: suspend Inv<U>.() -> Unit): U = null!!
+fun <U> sequence(block: suspend Inv<U>.() -> Unit): U = null!!
 
 interface Inv<T> {
     fun yield(element: T)
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt35684.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt35684.txt
index 6be771d7c72..ff6124d59eb 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt35684.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt35684.txt
@@ -1,7 +1,7 @@
 package
 
 public fun </*0*/ K> materialize(): Inv<K>
-@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ U> sequence(/*0*/ @kotlin.BuilderInference block: suspend Inv<U>.() -> kotlin.Unit): U
+@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ U> sequence(/*0*/ block: suspend Inv<U>.() -> kotlin.Unit): U
 public fun test_1(): kotlin.Unit
 public fun test_2(): kotlin.Unit
 public fun test_3(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt36202.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt36202.kt
index ba8a93c3291..8fca1ca76ab 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt36202.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt36202.kt
@@ -7,7 +7,7 @@ import kotlin.experimental.ExperimentalTypeInference
 interface Build<T>
 
 @OptIn(ExperimentalTypeInference::class)
-fun <T> build(@BuilderInference fn: Builder<T>.() -> Unit): Build<T> = TODO()
+fun <T> build(fn: Builder<T>.() -> Unit): Build<T> = TODO()
 
 interface Builder<T> {
     fun foo(fn: () -> T)
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt36202.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt36202.txt
index 9fa7b2a7e97..c77a57cb090 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt36202.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt36202.txt
@@ -1,6 +1,6 @@
 package
 
-@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ T> build(/*0*/ @kotlin.BuilderInference fn: Builder<T>.() -> kotlin.Unit): Build<T>
+@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ T> build(/*0*/ fn: Builder<T>.() -> kotlin.Unit): Build<T>
 public fun main(): kotlin.Unit
 
 public interface Build</*0*/ T> {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt36220.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt36220.kt
index 221fdeb0420..d73e674faea 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt36220.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt36220.kt
@@ -10,7 +10,7 @@ class TypeDefinition<KotlinType : Any> {
 }
 
 @OptIn(ExperimentalTypeInference::class)
-fun <KotlinType : Any> defineType(@BuilderInference definition: TypeDefinition<KotlinType>.() -> Unit): Unit = TODO()
+fun <KotlinType : Any> defineType(definition: TypeDefinition<KotlinType>.() -> Unit): Unit = TODO()
 
 fun main() {
     defineType {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt36220.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt36220.txt
index de05b946fc6..8ee9499805c 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt36220.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt36220.txt
@@ -1,6 +1,6 @@
 package
 
-@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ KotlinType : kotlin.Any> defineType(/*0*/ @kotlin.BuilderInference definition: TypeDefinition<KotlinType>.() -> kotlin.Unit): kotlin.Unit
+@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ KotlinType : kotlin.Any> defineType(/*0*/ definition: TypeDefinition<KotlinType>.() -> kotlin.Unit): kotlin.Unit
 public fun main(): kotlin.Unit
 
 public final class TypeDefinition</*0*/ KotlinType : kotlin.Any> {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt38667.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt38667.kt
index 2023b82c491..178c5ad03f3 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt38667.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt38667.kt
@@ -19,7 +19,7 @@ class TransitionDefinition<T> {
     fun transition(fromState: T? = null, toState: T? = null, init: TransitionSpec<T>.() -> Unit) {}
 }
 @OptIn(ExperimentalTypeInference::class)
-fun <T> transitionDefinition(@BuilderInference init: TransitionDefinition<T>.() -> Unit) = TransitionDefinition<T>().apply(init)
+fun <T> transitionDefinition(init: TransitionDefinition<T>.() -> Unit) = TransitionDefinition<T>().apply(init)
 
 fun main() {
     val intProp = IntPropKey()
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt38667.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt38667.txt
index d36d1fbd985..081c25f6b55 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt38667.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt38667.txt
@@ -1,7 +1,7 @@
 package
 
 public fun main(): kotlin.Unit
-@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ T> transitionDefinition(/*0*/ @kotlin.BuilderInference init: TransitionDefinition<T>.() -> kotlin.Unit): TransitionDefinition<T>
+@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ T> transitionDefinition(/*0*/ init: TransitionDefinition<T>.() -> kotlin.Unit): TransitionDefinition<T>
 
 public abstract class AnimationBuilder</*0*/ T> {
     public constructor AnimationBuilder</*0*/ T>()
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt38766.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt38766.kt
index fcc78ff60a1..8d32d5bf4c7 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt38766.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt38766.kt
@@ -13,7 +13,7 @@ inline fun <reified T, R> emptyFlow(crossinline transform: (Array<T>) -> R): Flo
 fun <T> flowOf1(value: T): Flow1<T> = TODO()
 
 @OptIn(ExperimentalTypeInference::class)
-fun <T> flow1(@BuilderInference block: suspend FlowCollector1<T>.() -> Unit): Flow1<T> = TODO()
+fun <T> flow1(block: suspend FlowCollector1<T>.() -> Unit): Flow1<T> = TODO()
 
 interface FlowCollector1<in T> {
     suspend fun emit(value: T)
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt38766.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt38766.txt
index e5bb97732f6..48a1df25990 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt38766.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt38766.txt
@@ -2,7 +2,7 @@ package
 
 public inline fun </*0*/ reified T, /*1*/ R> emptyFlow(/*0*/ crossinline transform: (kotlin.Array<T>) -> R): Flow1<R>
 public inline fun </*0*/ reified T, /*1*/ R> emptyFlow(/*0*/ crossinline transform: suspend (kotlin.Array<T>) -> R): Flow1<R>
-@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ T> flow1(/*0*/ @kotlin.BuilderInference block: suspend FlowCollector1<T>.() -> kotlin.Unit): Flow1<T>
+@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ T> flow1(/*0*/ block: suspend FlowCollector1<T>.() -> kotlin.Unit): Flow1<T>
 public fun </*0*/ T> flowOf1(/*0*/ value: T): Flow1<T>
 
 public interface Flow1</*0*/ out T> {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt41164.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt41164.fir.kt
index 2cb456de503..d6e11382b39 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt41164.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt41164.fir.kt
@@ -10,7 +10,7 @@ interface MyFlow<out T>
 fun <K> select(x: K, y: K): K = x
 
 @OptIn(ExperimentalTypeInference::class)
-fun <T> myCallbackFlow(@BuilderInference block: MyProducerScope<T>.() -> Unit): MyFlow<T> = null!!
+fun <T> myCallbackFlow(block: MyProducerScope<T>.() -> Unit): MyFlow<T> = null!!
 
 fun MyProducerScope<*>.myAwaitClose(block: () -> Unit = {}) {}
 fun <T> myEmptyFlow(): MyFlow<T> = null!!
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt41164.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt41164.kt
index 7aadaa1dd5f..c563929de53 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt41164.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt41164.kt
@@ -10,7 +10,7 @@ interface MyFlow<out T>
 fun <K> select(x: K, y: K): K = x
 
 @OptIn(ExperimentalTypeInference::class)
-fun <T> myCallbackFlow(@BuilderInference block: MyProducerScope<T>.() -> Unit): MyFlow<T> = null!!
+fun <T> myCallbackFlow(block: MyProducerScope<T>.() -> Unit): MyFlow<T> = null!!
 
 fun MyProducerScope<*>.myAwaitClose(block: () -> Unit = {}) {}
 fun <T> myEmptyFlow(): MyFlow<T> = null!!
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt41164.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt41164.txt
index 3a88e7890c0..78d5b680cc1 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt41164.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt41164.txt
@@ -1,6 +1,6 @@
 package
 
-@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ T> myCallbackFlow(/*0*/ @kotlin.BuilderInference block: MyProducerScope<T>.() -> kotlin.Unit): MyFlow<T>
+@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ T> myCallbackFlow(/*0*/ block: MyProducerScope<T>.() -> kotlin.Unit): MyFlow<T>
 public fun </*0*/ T> myEmptyFlow(): MyFlow<T>
 public fun </*0*/ K> select(/*0*/ x: K, /*1*/ y: K): K
 public fun test(): MyFlow<kotlin.Int>
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt41396.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt41396.kt
index e5cfacf8f3e..d50fd756c4b 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt41396.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt41396.kt
@@ -1,7 +1,7 @@
 // FIR_IDENTICAL
 // !DIAGNOSTICS: -OPT_IN_USAGE_ERROR -UNUSED_PARAMETER -CAST_NEVER_SUCCEEDS
 
-fun <T, R> Flow<T>.transformLatest(@BuilderInference transform: suspend FlowCollector<R>.(value: T) -> Unit) = null as Flow<R>
+fun <T, R> Flow<T>.transformLatest(transform: suspend FlowCollector<R>.(value: T) -> Unit) = null as Flow<R>
 
 interface Flow<out T> {
     suspend fun collect(collector: FlowCollector<T>)
@@ -11,7 +11,7 @@ interface FlowCollector<in T> {
     suspend fun emit(value: T)
 }
 
-fun <T> flow(@BuilderInference block: suspend FlowCollector<T>.() -> Unit) = null as Flow<T>
+fun <T> flow(block: suspend FlowCollector<T>.() -> Unit) = null as Flow<T>
 fun <T> flowOf(value: T) = null as Flow<T>
 
 fun foo() = flow {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt41396.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt41396.txt
index 51c52fb4b71..724f066a067 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt41396.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt41396.txt
@@ -1,9 +1,9 @@
 package
 
-public fun </*0*/ T> flow(/*0*/ @kotlin.BuilderInference block: suspend FlowCollector<T>.() -> kotlin.Unit): Flow<T>
+public fun </*0*/ T> flow(/*0*/ block: suspend FlowCollector<T>.() -> kotlin.Unit): Flow<T>
 public fun </*0*/ T> flowOf(/*0*/ value: T): Flow<T>
 public fun foo(): Flow<kotlin.Int>
-public fun </*0*/ T, /*1*/ R> Flow<T>.transformLatest(/*0*/ @kotlin.BuilderInference transform: suspend FlowCollector<R>.(value: T) -> kotlin.Unit): Flow<R>
+public fun </*0*/ T, /*1*/ R> Flow<T>.transformLatest(/*0*/ transform: suspend FlowCollector<R>.(value: T) -> kotlin.Unit): Flow<R>
 
 public interface Flow</*0*/ out T> {
     public abstract suspend fun collect(/*0*/ collector: FlowCollector<T>): kotlin.Unit
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/plusAssignInCoroutineContext.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/plusAssignInCoroutineContext.fir.kt
index d7a41dc54df..a388035d628 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/plusAssignInCoroutineContext.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/plusAssignInCoroutineContext.fir.kt
@@ -10,7 +10,7 @@ interface FlowCollector<in T> {
 
 interface Flow<T>
 
-public fun <T> flow(@BuilderInference block: suspend FlowCollector<T>.() -> Unit) = materialize<Flow<T>>()
+public fun <T> flow(block: suspend FlowCollector<T>.() -> Unit) = materialize<Flow<T>>()
 
 fun foo(total: Int, next: Int) = 10
 fun foo(total: Int, next: Float) = 10
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/plusAssignInCoroutineContext.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/plusAssignInCoroutineContext.kt
index 6a7a1c287d1..c9192379a6d 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/plusAssignInCoroutineContext.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/plusAssignInCoroutineContext.kt
@@ -10,7 +10,7 @@ interface FlowCollector<in T> {
 
 interface Flow<T>
 
-public fun <T> flow(@BuilderInference block: suspend FlowCollector<T>.() -> Unit) = materialize<Flow<T>>()
+public fun <T> flow(block: suspend FlowCollector<T>.() -> Unit) = materialize<Flow<T>>()
 
 fun foo(total: Int, next: Int) = 10
 fun foo(total: Int, next: Float) = 10
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/plusAssignInCoroutineContext.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/plusAssignInCoroutineContext.txt
index 2b5c4d5f111..d63a66fd235 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/plusAssignInCoroutineContext.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/plusAssignInCoroutineContext.txt
@@ -1,7 +1,7 @@
 package
 
 public fun call(/*0*/ x: kotlin.String): kotlin.Unit
-public fun </*0*/ T> flow(/*0*/ @kotlin.BuilderInference block: suspend FlowCollector<T>.() -> kotlin.Unit): Flow<T>
+public fun </*0*/ T> flow(/*0*/ block: suspend FlowCollector<T>.() -> kotlin.Unit): Flow<T>
 public fun foo(/*0*/ total: kotlin.Float, /*1*/ next: kotlin.Int): kotlin.Int
 public suspend fun foo(/*0*/ x: kotlin.Int): Flow<Bar>
 public fun foo(/*0*/ total: kotlin.Int, /*1*/ next: kotlin.Float): kotlin.Int
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/qualifiedResolvedExpressionInsideBuilderInference.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/qualifiedResolvedExpressionInsideBuilderInference.kt
index 5dc9e05dd80..19f4c8072d5 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/qualifiedResolvedExpressionInsideBuilderInference.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/qualifiedResolvedExpressionInsideBuilderInference.kt
@@ -12,7 +12,7 @@ fun test() {
 }
 
 @OptIn(ExperimentalTypeInference::class)
-fun <T> flow(@BuilderInference block: suspend FlowCollector<T>.() -> Unit): Flow<T> = TODO()
+fun <T> flow(block: suspend FlowCollector<T>.() -> Unit): Flow<T> = TODO()
 
 interface Flow<out T>
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/qualifiedResolvedExpressionInsideBuilderInference.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/qualifiedResolvedExpressionInsideBuilderInference.txt
index fb5553cbb6e..54c46d4bc21 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/qualifiedResolvedExpressionInsideBuilderInference.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/qualifiedResolvedExpressionInsideBuilderInference.txt
@@ -1,6 +1,6 @@
 package
 
-@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ T> flow(/*0*/ @kotlin.BuilderInference block: suspend FlowCollector<T>.() -> kotlin.Unit): Flow<T>
+@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ T> flow(/*0*/ block: suspend FlowCollector<T>.() -> kotlin.Unit): Flow<T>
 public fun test(): kotlin.Unit
 
 public interface Flow</*0*/ out T> {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators.kt
index efa45fcd214..533ec79ce0e 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators.kt
@@ -10,7 +10,7 @@ class GenericController<T> {
     suspend fun yield(t: T) {}
 }
 
-fun <S> generate(@BuilderInference g: suspend GenericController<S>.() -> Unit): List<S> = TODO()
+fun <S> generate(g: suspend GenericController<S>.() -> Unit): List<S> = TODO()
 
 val test1 = generate {
     yield(generate {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators.txt
index 7ff834cbffd..6018443cfb9 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators.txt
@@ -1,7 +1,7 @@
 package
 
 public val test1: kotlin.collections.List<kotlin.collections.List<kotlin.collections.List<kotlin.collections.List<kotlin.Int>>>>
-public fun </*0*/ S> generate(/*0*/ @kotlin.BuilderInference g: suspend GenericController<S>.() -> kotlin.Unit): kotlin.collections.List<S>
+public fun </*0*/ S> generate(/*0*/ g: suspend GenericController<S>.() -> kotlin.Unit): kotlin.collections.List<S>
 
 public final class GenericController</*0*/ T> {
     public constructor GenericController</*0*/ T>()
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators2.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators2.kt
index b6fce857fab..f7cec1d1e16 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators2.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators2.kt
@@ -11,9 +11,8 @@ class GenericController<T> {
     suspend fun yield(t: T) {}
 }
 
-fun <S> generate(@BuilderInference g: suspend GenericController<S>.() -> Unit): List<S> = TODO()
+fun <S> generate(g: suspend GenericController<S>.() -> Unit): List<S> = TODO()
 
-@BuilderInference
 suspend fun <S> GenericController<List<S>>.yieldGenerate(g: suspend GenericController<S>.() -> Unit): Unit = TODO()
 
 val test1 = generate {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators2.ni.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators2.ni.txt
index c4c702482ba..337638e04d4 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators2.ni.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators2.ni.txt
@@ -1,8 +1,8 @@
 package
 
 public val test1: kotlin.collections.List<kotlin.collections.List<kotlin.Int>>
-public fun </*0*/ S> generate(/*0*/ @kotlin.BuilderInference g: suspend GenericController<S>.() -> kotlin.Unit): kotlin.collections.List<S>
-@kotlin.BuilderInference public suspend fun </*0*/ S> GenericController<kotlin.collections.List<S>>.yieldGenerate(/*0*/ g: suspend GenericController<S>.() -> kotlin.Unit): kotlin.Unit
+public fun </*0*/ S> generate(/*0*/ g: suspend GenericController<S>.() -> kotlin.Unit): kotlin.collections.List<S>
+public suspend fun </*0*/ S> GenericController<kotlin.collections.List<S>>.yieldGenerate(/*0*/ g: suspend GenericController<S>.() -> kotlin.Unit): kotlin.Unit
 
 public final class GenericController</*0*/ T> {
     public constructor GenericController</*0*/ T>()
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators2.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators2.txt
index 26da761b461..e12e02c141c 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators2.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators2.txt
@@ -1,8 +1,8 @@
 package
 
 public val test1: kotlin.collections.List<kotlin.Int>
-public fun </*0*/ S> generate(/*0*/ @kotlin.BuilderInference g: suspend GenericController<S>.() -> kotlin.Unit): kotlin.collections.List<S>
-@kotlin.BuilderInference public suspend fun </*0*/ S> GenericController<kotlin.collections.List<S>>.yieldGenerate(/*0*/ g: suspend GenericController<S>.() -> kotlin.Unit): kotlin.Unit
+public fun </*0*/ S> generate(/*0*/ g: suspend GenericController<S>.() -> kotlin.Unit): kotlin.collections.List<S>
+public suspend fun </*0*/ S> GenericController<kotlin.collections.List<S>>.yieldGenerate(/*0*/ g: suspend GenericController<S>.() -> kotlin.Unit): kotlin.Unit
 
 public final class GenericController</*0*/ T> {
     public constructor GenericController</*0*/ T>()
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/returnTypeInference2.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/returnTypeInference2.kt
index e661f320d58..6e29dd7a1f3 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/returnTypeInference2.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/returnTypeInference2.kt
@@ -10,7 +10,7 @@ class Controller<T> {
     suspend fun yield(t: T) {}
 }
 
-fun <T, R> generate(@BuilderInference g: suspend Controller<T>.() -> R): Pair<T, R> = TODO()
+fun <T, R> generate(g: suspend Controller<T>.() -> R): Pair<T, R> = TODO()
 
 val test1 = generate {
     yield("")
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/returnTypeInference2.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/returnTypeInference2.txt
index e2ed19c5b55..2682b299a82 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/returnTypeInference2.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/returnTypeInference2.txt
@@ -1,7 +1,7 @@
 package
 
 public val test1: Pair<kotlin.String, kotlin.Int>
-public fun </*0*/ T, /*1*/ R> generate(/*0*/ @kotlin.BuilderInference g: suspend Controller<T>.() -> R): Pair<T, R>
+public fun </*0*/ T, /*1*/ R> generate(/*0*/ g: suspend Controller<T>.() -> R): Pair<T, R>
 
 public final class Controller</*0*/ T> {
     public constructor Controller</*0*/ T>()
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/severalCandidatesWithDifferentVisibility.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/severalCandidatesWithDifferentVisibility.kt
index a85eff09beb..bc39419851f 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/severalCandidatesWithDifferentVisibility.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/severalCandidatesWithDifferentVisibility.kt
@@ -32,7 +32,7 @@ interface Inv<T> {
     fun emit(e: T)
 }
 
-fun <T> invBuilder(@BuilderInference block: Inv<T>.() -> Unit) {}
+fun <T> invBuilder(block: Inv<T>.() -> Unit) {}
 
 fun test() {
     invBuilder {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/severalCandidatesWithDifferentVisibility.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/severalCandidatesWithDifferentVisibility.txt
index 44e74079fa4..285a5099b8f 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/severalCandidatesWithDifferentVisibility.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/severalCandidatesWithDifferentVisibility.txt
@@ -31,7 +31,7 @@ package b {
 }
 
 package c {
-    public fun </*0*/ T> invBuilder(/*0*/ @kotlin.BuilderInference block: c.Inv<T>.() -> kotlin.Unit): kotlin.Unit
+    public fun </*0*/ T> invBuilder(/*0*/ block: c.Inv<T>.() -> kotlin.Unit): kotlin.Unit
     public fun test(): kotlin.Unit
 
     public interface Inv</*0*/ T> {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/simpleGenerator.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/simpleGenerator.kt
index dbe3c71b91c..23aa85c2566 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/simpleGenerator.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/simpleGenerator.kt
@@ -12,7 +12,7 @@ class GenericController<T> {
     suspend fun yieldVararg(vararg t: T) {}
 }
 
-fun <S> generate(@BuilderInference g: suspend GenericController<S>.() -> Unit): S = TODO()
+fun <S> generate(g: suspend GenericController<S>.() -> Unit): S = TODO()
 
 val test1 = generate {
     yield(4)
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/simpleGenerator.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/simpleGenerator.txt
index a2fe7f4c928..85d771e19cb 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/simpleGenerator.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/simpleGenerator.txt
@@ -4,7 +4,7 @@ public val test1: kotlin.Int
 public val test2: kotlin.Int
 public val test3: kotlin.Int
 public val test4: kotlin.Any
-public fun </*0*/ S> generate(/*0*/ @kotlin.BuilderInference g: suspend GenericController<S>.() -> kotlin.Unit): S
+public fun </*0*/ S> generate(/*0*/ g: suspend GenericController<S>.() -> kotlin.Unit): S
 public fun </*0*/ X> setOf(/*0*/ vararg x: X /*kotlin.Array<out X>*/): kotlin.collections.Set<X>
 
 public final class GenericController</*0*/ T> {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWithErrors.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWithErrors.fir.kt
index d451eb553e1..52615bdeada 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWithErrors.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWithErrors.fir.kt
@@ -10,7 +10,7 @@ class Controller<T> {
     suspend fun yield(t: T) {}
 }
 
-fun <S> generate(@BuilderInference g: suspend Controller<S>.() -> Unit): S = TODO()
+fun <S> generate(g: suspend Controller<S>.() -> Unit): S = TODO()
 
 class A
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWithErrors.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWithErrors.kt
index 05d6c07d27d..ecc193c2bb1 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWithErrors.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWithErrors.kt
@@ -10,7 +10,7 @@ class Controller<T> {
     suspend fun yield(t: T) {}
 }
 
-fun <S> generate(@BuilderInference g: suspend Controller<S>.() -> Unit): S = TODO()
+fun <S> generate(g: suspend Controller<S>.() -> Unit): S = TODO()
 
 class A
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWithErrors.ni.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWithErrors.ni.txt
index a9e794c6cff..131c32a7016 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWithErrors.ni.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWithErrors.ni.txt
@@ -4,7 +4,7 @@ public val test1: [Error type: Not found recorded type for generate {
     yield(A)
 }]
 public val test2: kotlin.Int
-public fun </*0*/ S> generate(/*0*/ @kotlin.BuilderInference g: suspend Controller<S>.() -> kotlin.Unit): S
+public fun </*0*/ S> generate(/*0*/ g: suspend Controller<S>.() -> kotlin.Unit): S
 
 public final class A {
     public constructor A()
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWithErrors.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWithErrors.txt
index e1c830c8f28..fa1ec20c49a 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWithErrors.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWithErrors.txt
@@ -4,7 +4,7 @@ public val test1: [ERROR : Type for generate {
     yield(A)
 }]
 public val test2: kotlin.Int
-public fun </*0*/ S> generate(/*0*/ @kotlin.BuilderInference g: suspend Controller<S>.() -> kotlin.Unit): S
+public fun </*0*/ S> generate(/*0*/ g: suspend Controller<S>.() -> kotlin.Unit): S
 
 public final class A {
     public constructor A()
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/twoReceiversInScope.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/twoReceiversInScope.kt
index d8045585a56..5f96b79e61d 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/twoReceiversInScope.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/twoReceiversInScope.kt
@@ -9,13 +9,13 @@ import kotlin.experimental.ExperimentalTypeInference
 interface MyFlow<out T>
 interface MyFlowCollector<in T>
 
-fun <F> flow(@BuilderInference block: MyFlowCollector<F>.() -> Unit): MyFlow<F> = TODO()
+fun <F> flow(block: MyFlowCollector<F>.() -> Unit): MyFlow<F> = TODO()
 
 interface SendChannel<in E> {
     fun send(element: E)
 }
 
-fun <P> produce(@BuilderInference block: SendChannel<P>.() -> Unit) {}
+fun <P> produce(block: SendChannel<P>.() -> Unit) {}
 
 fun <C> MyFlow<C>.collect(action: (C) -> Unit) {}
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/twoReceiversInScope.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/twoReceiversInScope.txt
index 6b50b41daa0..c0da9c7c766 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/twoReceiversInScope.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/twoReceiversInScope.txt
@@ -1,7 +1,7 @@
 package
 
-public fun </*0*/ F> flow(/*0*/ @kotlin.BuilderInference block: MyFlowCollector<F>.() -> kotlin.Unit): MyFlow<F>
-public fun </*0*/ P> produce(/*0*/ @kotlin.BuilderInference block: SendChannel<P>.() -> kotlin.Unit): kotlin.Unit
+public fun </*0*/ F> flow(/*0*/ block: MyFlowCollector<F>.() -> kotlin.Unit): MyFlow<F>
+public fun </*0*/ P> produce(/*0*/ block: SendChannel<P>.() -> kotlin.Unit): kotlin.Unit
 public fun </*0*/ C> MyFlow<C>.collect(/*0*/ action: (C) -> kotlin.Unit): kotlin.Unit
 private fun </*0*/ T> MyFlow<T>.idScoped(): MyFlow<T>
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/typeFromReceiver.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/typeFromReceiver.kt
index 218605ddbd3..b424b81d63b 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/typeFromReceiver.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/typeFromReceiver.kt
@@ -8,9 +8,8 @@ import kotlin.experimental.ExperimentalTypeInference
 
 class GenericController<T>
 
-fun <S> generate(@BuilderInference g: suspend GenericController<S>.() -> Unit): List<S> = TODO()
+fun <S> generate(g: suspend GenericController<S>.() -> Unit): List<S> = TODO()
 
-@BuilderInference
 suspend fun GenericController<List<String>>.test() {}
 
 val test1 = generate {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/typeFromReceiver.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/typeFromReceiver.txt
index b2128c4125e..60aaa9dcf70 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/typeFromReceiver.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/typeFromReceiver.txt
@@ -1,8 +1,8 @@
 package
 
 public val test1: kotlin.collections.List<kotlin.collections.List<kotlin.String>>
-public fun </*0*/ S> generate(/*0*/ @kotlin.BuilderInference g: suspend GenericController<S>.() -> kotlin.Unit): kotlin.collections.List<S>
-@kotlin.BuilderInference public suspend fun GenericController<kotlin.collections.List<kotlin.String>>.test(): kotlin.Unit
+public fun </*0*/ S> generate(/*0*/ g: suspend GenericController<S>.() -> kotlin.Unit): kotlin.collections.List<S>
+public suspend fun GenericController<kotlin.collections.List<kotlin.String>>.test(): kotlin.Unit
 
 public final class GenericController</*0*/ T> {
     public constructor GenericController</*0*/ T>()
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/variableCallInsideBuilderFunction.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/variableCallInsideBuilderFunction.kt
index ce784995d9b..d0c3ccdbe25 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/variableCallInsideBuilderFunction.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/variableCallInsideBuilderFunction.kt
@@ -10,7 +10,7 @@ interface ProducerScope<E> {
 }
 
 @OptIn(ExperimentalTypeInference::class)
-fun <E> produce(@BuilderInference block: ProducerScope<E>.() -> Unit): ProducerScope<E> = TODO()
+fun <E> produce(block: ProducerScope<E>.() -> Unit): ProducerScope<E> = TODO()
 
 fun <K> filter(e: K, predicate: (K) -> Boolean) =
     produce {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/variableCallInsideBuilderFunction.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/variableCallInsideBuilderFunction.txt
index 0ada6c88a4f..4a2d560ce20 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/variableCallInsideBuilderFunction.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/variableCallInsideBuilderFunction.txt
@@ -1,7 +1,7 @@
 package
 
 public fun </*0*/ K> filter(/*0*/ e: K, /*1*/ predicate: (K) -> kotlin.Boolean): ProducerScope<kotlin.Int>
-@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ E> produce(/*0*/ @kotlin.BuilderInference block: ProducerScope<E>.() -> kotlin.Unit): ProducerScope<E>
+@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ E> produce(/*0*/ block: ProducerScope<E>.() -> kotlin.Unit): ProducerScope<E>
 
 public interface ProducerScope</*0*/ E> {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/variableOfAFunctionTypeCall.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/variableOfAFunctionTypeCall.kt
index 65d93e45012..8d357c35cef 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/variableOfAFunctionTypeCall.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/variableOfAFunctionTypeCall.kt
@@ -11,7 +11,7 @@ interface ProducerScope<E> {
 }
 
 @OptIn(ExperimentalTypeInference::class)
-fun <E> produce(@BuilderInference block: ProducerScope<E>.() -> Unit): ProducerScope<E> = TODO()
+fun <E> produce(block: ProducerScope<E>.() -> Unit): ProducerScope<E> = TODO()
 
 fun <K> filter(e: K, predicate: (K) -> Boolean) =
     produce {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/variableOfAFunctionTypeCall.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/variableOfAFunctionTypeCall.txt
index 0ada6c88a4f..4a2d560ce20 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/variableOfAFunctionTypeCall.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/variableOfAFunctionTypeCall.txt
@@ -1,7 +1,7 @@
 package
 
 public fun </*0*/ K> filter(/*0*/ e: K, /*1*/ predicate: (K) -> kotlin.Boolean): ProducerScope<kotlin.Int>
-@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ E> produce(/*0*/ @kotlin.BuilderInference block: ProducerScope<E>.() -> kotlin.Unit): ProducerScope<E>
+@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ E> produce(/*0*/ block: ProducerScope<E>.() -> kotlin.Unit): ProducerScope<E>
 
 public interface ProducerScope</*0*/ E> {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/withParameter.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/withParameter.kt
index 5a001b9344e..88ee9624a85 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/withParameter.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/withParameter.kt
@@ -10,7 +10,7 @@ class GenericController<T> {
     suspend fun yield(t: T) {}
 }
 
-fun <S, P1, P2, R> generate(p1: P1, p2: List<P2>, @BuilderInference g: suspend GenericController<S>.(P1, P2) -> R): Four<S, P1, P2, R> = TODO()
+fun <S, P1, P2, R> generate(p1: P1, p2: List<P2>, g: suspend GenericController<S>.(P1, P2) -> R): Four<S, P1, P2, R> = TODO()
 
 val test1 = generate(1, listOf("")) { p1, p2 ->
     yield(p1)
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/withParameter.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/withParameter.txt
index 788daae86fc..3107d162860 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/withParameter.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/withParameter.txt
@@ -1,7 +1,7 @@
 package
 
 public val test1: Four<kotlin.Int, kotlin.Int, kotlin.String, kotlin.String>
-public fun </*0*/ S, /*1*/ P1, /*2*/ P2, /*3*/ R> generate(/*0*/ p1: P1, /*1*/ p2: kotlin.collections.List<P2>, /*2*/ @kotlin.BuilderInference g: suspend GenericController<S>.(P1, P2) -> R): Four<S, P1, P2, R>
+public fun </*0*/ S, /*1*/ P1, /*2*/ P2, /*3*/ R> generate(/*0*/ p1: P1, /*1*/ p2: kotlin.collections.List<P2>, /*2*/ g: suspend GenericController<S>.(P1, P2) -> R): Four<S, P1, P2, R>
 public fun </*0*/ X> listOf(/*0*/ vararg x: X /*kotlin.Array<out X>*/): kotlin.collections.List<X>
 
 public final class Four</*0*/ X, /*1*/ Y, /*2*/ Z, /*3*/ T> {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt28658.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt28658.kt
index 64d321de282..8bcd30b41af 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt28658.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt28658.kt
@@ -20,7 +20,7 @@ class Foo<T>
 fun <T> f1(f: Foo<T>.() -> Unit) {}
 
 @OptIn(ExperimentalTypeInference::class)
-fun <T> f2(@BuilderInference f: Foo<T>.() -> Unit) {
+fun <T> f2(f: Foo<T>.() -> Unit) {
 }
 
 fun test3() {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt28658.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt28658.txt
index bb57cac859d..e79dca42f61 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt28658.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt28658.txt
@@ -1,7 +1,7 @@
 package
 
 public fun </*0*/ T> f1(/*0*/ f: Foo<T>.() -> kotlin.Unit): kotlin.Unit
-@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ T> f2(/*0*/ @kotlin.BuilderInference f: Foo<T>.() -> kotlin.Unit): kotlin.Unit
+@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ T> f2(/*0*/ f: Foo<T>.() -> kotlin.Unit): kotlin.Unit
 public fun test1(): kotlin.Unit
 public fun test2(): [Error type: Return type for function cannot be resolved]
 public fun test3(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt37309.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt37309.kt
index 23555dba723..61da5678675 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt37309.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt37309.kt
@@ -5,7 +5,7 @@
 import kotlin.experimental.ExperimentalTypeInference
 
 @OptIn(ExperimentalTypeInference::class)
-fun <E> myBuildList(@BuilderInference builderAction: MutableList<E>.() -> Unit) {
+fun <E> myBuildList(builderAction: MutableList<E>.() -> Unit) {
     ArrayList<E>().builderAction()
 }
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt37309.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt37309.txt
index b497685d03c..7f19fff4ec2 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt37309.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt37309.txt
@@ -1,7 +1,7 @@
 package
 
 @kotlin.OptIn(markerClass = {kotlin.ExperimentalStdlibApi::class}) public fun main(): kotlin.Unit
-@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ E> myBuildList(/*0*/ @kotlin.BuilderInference builderAction: kotlin.collections.MutableList<E>.() -> kotlin.Unit): kotlin.Unit
+@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun </*0*/ E> myBuildList(/*0*/ builderAction: kotlin.collections.MutableList<E>.() -> kotlin.Unit): kotlin.Unit
 
 public final class Foo {
     public constructor Foo(/*0*/ notNullProp: kotlin.String)
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/outerYield_1_3.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/outerYield_1_3.kt
index 20fb52755e0..fa08071a136 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/outerYield_1_3.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/outerYield_1_3.kt
@@ -28,9 +28,8 @@ class RestrictedController<T> {
     }
 }
 
-fun <T> buildSequence(@BuilderInference c: suspend RestrictedController<T>.() -> Unit) {}
+fun <T> buildSequence(c: suspend RestrictedController<T>.() -> Unit) {}
 
-@BuilderInference
 suspend fun <T> RestrictedController<T>.yield2(x: T) {}
 
 fun test() {
diff --git a/compiler/testData/ir/irText/expressions/kt47082.ir.txt b/compiler/testData/ir/irText/expressions/kt47082.ir.txt
index 0335d77127a..91eb84ddab3 100644
--- a/compiler/testData/ir/irText/expressions/kt47082.ir.txt
+++ b/compiler/testData/ir/irText/expressions/kt47082.ir.txt
@@ -2,8 +2,6 @@ FILE fqName:<root> fileName:/kt47082.kt
   FUN name:produce visibility:public modality:FINAL <E> (block:@[ExtensionFunctionType] kotlin.Function1<<root>.Derived<E of <root>.produce>, kotlin.Unit>) returnType:E of <root>.produce
     TYPE_PARAMETER name:E index:0 variance: superTypes:[kotlin.Any?] reified:false
     VALUE_PARAMETER name:block index:0 type:@[ExtensionFunctionType] kotlin.Function1<<root>.Derived<E of <root>.produce>, kotlin.Unit>
-      annotations:
-        BuilderInference
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun produce <E> (block: @[ExtensionFunctionType] kotlin.Function1<<root>.Derived<E of <root>.produce>, kotlin.Unit>): E of <root>.produce declared in <root>'
         TYPE_OP type=E of <root>.produce origin=CAST typeOperand=E of <root>.produce
diff --git a/compiler/testData/ir/irText/expressions/kt47082.kt b/compiler/testData/ir/irText/expressions/kt47082.kt
index 9cc008a651e..8baec8a124e 100644
--- a/compiler/testData/ir/irText/expressions/kt47082.kt
+++ b/compiler/testData/ir/irText/expressions/kt47082.kt
@@ -5,7 +5,7 @@
 
 import kotlin.experimental.ExperimentalTypeInference
 
-fun <E> produce(@BuilderInference block: Derived<E>.() -> Unit): E = null as E
+fun <E> produce(block: Derived<E>.() -> Unit): E = null as E
 
 interface Derived<in E> : Base<E>
 
diff --git a/compiler/testData/ir/irText/expressions/kt47082.kt.txt b/compiler/testData/ir/irText/expressions/kt47082.kt.txt
index 54f5d73be76..05f9d36f9b2 100644
--- a/compiler/testData/ir/irText/expressions/kt47082.kt.txt
+++ b/compiler/testData/ir/irText/expressions/kt47082.kt.txt
@@ -1,4 +1,4 @@
-fun <E : Any?> produce(@BuilderInference block: @ExtensionFunctionType Function1<Derived<E>, Unit>): E {
+fun <E : Any?> produce(block: @ExtensionFunctionType Function1<Derived<E>, Unit>): E {
   return null as E
 }
 
diff --git a/compiler/testData/ir/irText/types/castsInsideCoroutineInference.fir.ir.txt b/compiler/testData/ir/irText/types/castsInsideCoroutineInference.fir.ir.txt
index e958152e591..e7b31f60b0e 100644
--- a/compiler/testData/ir/irText/types/castsInsideCoroutineInference.fir.ir.txt
+++ b/compiler/testData/ir/irText/types/castsInsideCoroutineInference.fir.ir.txt
@@ -4,8 +4,6 @@ FILE fqName:<root> fileName:/castsInsideCoroutineInference.kt
       OptIn(markerClass = [CLASS_REFERENCE 'CLASS IR_EXTERNAL_DECLARATION_STUB ANNOTATION_CLASS name:ExperimentalTypeInference modality:FINAL visibility:public superTypes:[kotlin.Annotation]' type=kotlin.reflect.KClass<kotlin.experimental.ExperimentalTypeInference>])
     TYPE_PARAMETER name:R index:0 variance: superTypes:[kotlin.Any?] reified:false
     VALUE_PARAMETER name:block index:0 type:@[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<<root>.CoroutineScope, <root>.FlowCollector<R of <root>.scopedFlow>, kotlin.Unit>
-      annotations:
-        BuilderInference
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun scopedFlow <R> (block: @[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<<root>.CoroutineScope, <root>.FlowCollector<R of <root>.scopedFlow>, kotlin.Unit>): <root>.Flow<R of <root>.scopedFlow> declared in <root>'
         CALL 'public final fun flow <T> (block: @[ExtensionFunctionType] kotlin.coroutines.SuspendFunction1<<root>.FlowCollector<T of <root>.flow>, kotlin.Unit>): <root>.Flow<T of <root>.flow> declared in <root>' type=<root>.Flow<R of <root>.scopedFlow> origin=null
@@ -56,8 +54,6 @@ FILE fqName:<root> fileName:/castsInsideCoroutineInference.kt
       OptIn(markerClass = [CLASS_REFERENCE 'CLASS IR_EXTERNAL_DECLARATION_STUB ANNOTATION_CLASS name:ExperimentalTypeInference modality:FINAL visibility:public superTypes:[kotlin.Annotation]' type=kotlin.reflect.KClass<kotlin.experimental.ExperimentalTypeInference>])
     TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] reified:false
     VALUE_PARAMETER name:block index:0 type:@[ExtensionFunctionType] kotlin.coroutines.SuspendFunction1<<root>.FlowCollector<T of <root>.unsafeFlow>, kotlin.Unit> [crossinline]
-      annotations:
-        BuilderInference
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun unsafeFlow <T> (block: @[ExtensionFunctionType] kotlin.coroutines.SuspendFunction1<<root>.FlowCollector<T of <root>.unsafeFlow>, kotlin.Unit>): <root>.Flow<T of <root>.unsafeFlow> [inline] declared in <root>'
         CALL 'public final fun TODO (): kotlin.Nothing [inline] declared in kotlin.StandardKt' type=kotlin.Nothing origin=null
@@ -196,8 +192,6 @@ FILE fqName:<root> fileName:/castsInsideCoroutineInference.kt
       OptIn(markerClass = [CLASS_REFERENCE 'CLASS IR_EXTERNAL_DECLARATION_STUB ANNOTATION_CLASS name:ExperimentalTypeInference modality:FINAL visibility:public superTypes:[kotlin.Annotation]' type=kotlin.reflect.KClass<kotlin.experimental.ExperimentalTypeInference>])
     TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] reified:false
     VALUE_PARAMETER name:block index:0 type:@[ExtensionFunctionType] kotlin.coroutines.SuspendFunction1<<root>.FlowCollector<T of <root>.flow>, kotlin.Unit>
-      annotations:
-        BuilderInference
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun flow <T> (block: @[ExtensionFunctionType] kotlin.coroutines.SuspendFunction1<<root>.FlowCollector<T of <root>.flow>, kotlin.Unit>): <root>.Flow<T of <root>.flow> declared in <root>'
         CALL 'public final fun TODO (): kotlin.Nothing [inline] declared in kotlin.StandardKt' type=kotlin.Nothing origin=null
@@ -206,8 +200,6 @@ FILE fqName:<root> fileName:/castsInsideCoroutineInference.kt
       OptIn(markerClass = [CLASS_REFERENCE 'CLASS IR_EXTERNAL_DECLARATION_STUB ANNOTATION_CLASS name:ExperimentalTypeInference modality:FINAL visibility:public superTypes:[kotlin.Annotation]' type=kotlin.reflect.KClass<kotlin.experimental.ExperimentalTypeInference>])
     TYPE_PARAMETER name:R index:0 variance: superTypes:[kotlin.Any?] reified:false
     VALUE_PARAMETER name:block index:0 type:@[ExtensionFunctionType] kotlin.coroutines.SuspendFunction1<<root>.CoroutineScope, R of <root>.flowScope>
-      annotations:
-        BuilderInference
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun flowScope <R> (block: @[ExtensionFunctionType] kotlin.coroutines.SuspendFunction1<<root>.CoroutineScope, R of <root>.flowScope>): R of <root>.flowScope [suspend] declared in <root>'
         CALL 'public final fun TODO (): kotlin.Nothing [inline] declared in kotlin.StandardKt' type=kotlin.Nothing origin=null
@@ -315,8 +307,6 @@ FILE fqName:<root> fileName:/castsInsideCoroutineInference.kt
     TYPE_PARAMETER name:E index:0 variance: superTypes:[kotlin.Any?] reified:false
     $receiver: VALUE_PARAMETER name:<this> type:<root>.CoroutineScope
     VALUE_PARAMETER name:block index:0 type:@[ExtensionFunctionType] kotlin.coroutines.SuspendFunction1<<root>.ProducerScope<E of <root>.produce>, kotlin.Unit>
-      annotations:
-        BuilderInference
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun produce <E> (block: @[ExtensionFunctionType] kotlin.coroutines.SuspendFunction1<<root>.ProducerScope<E of <root>.produce>, kotlin.Unit>): <root>.ReceiveChannel<E of <root>.produce> declared in <root>'
         CALL 'public final fun TODO (): kotlin.Nothing [inline] declared in kotlin.StandardKt' type=kotlin.Nothing origin=null
diff --git a/compiler/testData/ir/irText/types/castsInsideCoroutineInference.fir.kt.txt b/compiler/testData/ir/irText/types/castsInsideCoroutineInference.fir.kt.txt
index ff9560c7bff..a7b83133498 100644
--- a/compiler/testData/ir/irText/types/castsInsideCoroutineInference.fir.kt.txt
+++ b/compiler/testData/ir/irText/types/castsInsideCoroutineInference.fir.kt.txt
@@ -1,5 +1,5 @@
 @OptIn(markerClass = [ExperimentalTypeInference::class])
-fun <R : Any?> scopedFlow(@BuilderInference block: @ExtensionFunctionType SuspendFunction2<CoroutineScope, FlowCollector<R>, Unit>): Flow<R> {
+fun <R : Any?> scopedFlow(block: @ExtensionFunctionType SuspendFunction2<CoroutineScope, FlowCollector<R>, Unit>): Flow<R> {
   return flow<R>(block = local suspend fun FlowCollector<R>.<anonymous>() {
     val collector: FlowCollector<R> = $this$flow
     flowScope<Unit>(block = local suspend fun CoroutineScope.<anonymous>() {
@@ -22,7 +22,7 @@ suspend fun <T : Any?> FlowCollector<T>.invokeSafely(action: @ExtensionFunctionT
 }
 
 @OptIn(markerClass = [ExperimentalTypeInference::class])
-inline fun <T : Any?> unsafeFlow(@BuilderInference crossinline block: @ExtensionFunctionType SuspendFunction1<FlowCollector<T>, Unit>): Flow<T> {
+inline fun <T : Any?> unsafeFlow(crossinline block: @ExtensionFunctionType SuspendFunction1<FlowCollector<T>, Unit>): Flow<T> {
   return TODO()
 }
 
@@ -84,12 +84,12 @@ class SafeCollector<T : Any?> : FlowCollector<T> {
 }
 
 @OptIn(markerClass = [ExperimentalTypeInference::class])
-fun <T : Any?> flow(@BuilderInference block: @ExtensionFunctionType SuspendFunction1<FlowCollector<T>, Unit>): Flow<T> {
+fun <T : Any?> flow(block: @ExtensionFunctionType SuspendFunction1<FlowCollector<T>, Unit>): Flow<T> {
   return TODO()
 }
 
 @OptIn(markerClass = [ExperimentalTypeInference::class])
-suspend fun <R : Any?> flowScope(@BuilderInference block: @ExtensionFunctionType SuspendFunction1<CoroutineScope, R>): R {
+suspend fun <R : Any?> flowScope(block: @ExtensionFunctionType SuspendFunction1<CoroutineScope, R>): R {
   return TODO()
 }
 
@@ -127,7 +127,7 @@ interface ReceiveChannel<out E : Any?> {
 }
 
 @OptIn(markerClass = [ExperimentalTypeInference::class])
-fun <E : Any?> CoroutineScope.produce(@BuilderInference block: @ExtensionFunctionType SuspendFunction1<ProducerScope<E>, Unit>): ReceiveChannel<E> {
+fun <E : Any?> CoroutineScope.produce(block: @ExtensionFunctionType SuspendFunction1<ProducerScope<E>, Unit>): ReceiveChannel<E> {
   return TODO()
 }
 
diff --git a/compiler/testData/ir/irText/types/castsInsideCoroutineInference.ir.txt b/compiler/testData/ir/irText/types/castsInsideCoroutineInference.ir.txt
index 321b0684d3f..701391c4d66 100644
--- a/compiler/testData/ir/irText/types/castsInsideCoroutineInference.ir.txt
+++ b/compiler/testData/ir/irText/types/castsInsideCoroutineInference.ir.txt
@@ -4,8 +4,6 @@ FILE fqName:<root> fileName:/castsInsideCoroutineInference.kt
       OptIn(markerClass = [CLASS_REFERENCE 'CLASS IR_EXTERNAL_DECLARATION_STUB ANNOTATION_CLASS name:ExperimentalTypeInference modality:OPEN visibility:public superTypes:[kotlin.Annotation]' type=kotlin.reflect.KClass<kotlin.experimental.ExperimentalTypeInference>])
     TYPE_PARAMETER name:R index:0 variance: superTypes:[kotlin.Any?] reified:false
     VALUE_PARAMETER name:block index:0 type:@[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<<root>.CoroutineScope, <root>.FlowCollector<R of <root>.scopedFlow>, kotlin.Unit>
-      annotations:
-        BuilderInference
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun scopedFlow <R> (block: @[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<<root>.CoroutineScope, <root>.FlowCollector<R of <root>.scopedFlow>, kotlin.Unit>): <root>.Flow<R of <root>.scopedFlow> declared in <root>'
         CALL 'public final fun flow <T> (block: @[ExtensionFunctionType] kotlin.coroutines.SuspendFunction1<<root>.FlowCollector<T of <root>.flow>, kotlin.Unit>): <root>.Flow<T of <root>.flow> declared in <root>' type=<root>.Flow<R of <root>.scopedFlow> origin=null
@@ -56,8 +54,6 @@ FILE fqName:<root> fileName:/castsInsideCoroutineInference.kt
       OptIn(markerClass = [CLASS_REFERENCE 'CLASS IR_EXTERNAL_DECLARATION_STUB ANNOTATION_CLASS name:ExperimentalTypeInference modality:OPEN visibility:public superTypes:[kotlin.Annotation]' type=kotlin.reflect.KClass<kotlin.experimental.ExperimentalTypeInference>])
     TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] reified:false
     VALUE_PARAMETER name:block index:0 type:@[ExtensionFunctionType] kotlin.coroutines.SuspendFunction1<<root>.FlowCollector<T of <root>.unsafeFlow>, kotlin.Unit> [crossinline]
-      annotations:
-        BuilderInference
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun unsafeFlow <T> (block: @[ExtensionFunctionType] kotlin.coroutines.SuspendFunction1<<root>.FlowCollector<T of <root>.unsafeFlow>, kotlin.Unit>): <root>.Flow<T of <root>.unsafeFlow> [inline] declared in <root>'
         CALL 'public final fun TODO (): kotlin.Nothing [inline] declared in kotlin.StandardKt' type=kotlin.Nothing origin=null
@@ -196,8 +192,6 @@ FILE fqName:<root> fileName:/castsInsideCoroutineInference.kt
       OptIn(markerClass = [CLASS_REFERENCE 'CLASS IR_EXTERNAL_DECLARATION_STUB ANNOTATION_CLASS name:ExperimentalTypeInference modality:OPEN visibility:public superTypes:[kotlin.Annotation]' type=kotlin.reflect.KClass<kotlin.experimental.ExperimentalTypeInference>])
     TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] reified:false
     VALUE_PARAMETER name:block index:0 type:@[ExtensionFunctionType] kotlin.coroutines.SuspendFunction1<<root>.FlowCollector<T of <root>.flow>, kotlin.Unit>
-      annotations:
-        BuilderInference
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun flow <T> (block: @[ExtensionFunctionType] kotlin.coroutines.SuspendFunction1<<root>.FlowCollector<T of <root>.flow>, kotlin.Unit>): <root>.Flow<T of <root>.flow> declared in <root>'
         CALL 'public final fun TODO (): kotlin.Nothing [inline] declared in kotlin.StandardKt' type=kotlin.Nothing origin=null
@@ -206,8 +200,6 @@ FILE fqName:<root> fileName:/castsInsideCoroutineInference.kt
       OptIn(markerClass = [CLASS_REFERENCE 'CLASS IR_EXTERNAL_DECLARATION_STUB ANNOTATION_CLASS name:ExperimentalTypeInference modality:OPEN visibility:public superTypes:[kotlin.Annotation]' type=kotlin.reflect.KClass<kotlin.experimental.ExperimentalTypeInference>])
     TYPE_PARAMETER name:R index:0 variance: superTypes:[kotlin.Any?] reified:false
     VALUE_PARAMETER name:block index:0 type:@[ExtensionFunctionType] kotlin.coroutines.SuspendFunction1<<root>.CoroutineScope, R of <root>.flowScope>
-      annotations:
-        BuilderInference
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun flowScope <R> (block: @[ExtensionFunctionType] kotlin.coroutines.SuspendFunction1<<root>.CoroutineScope, R of <root>.flowScope>): R of <root>.flowScope [suspend] declared in <root>'
         CALL 'public final fun TODO (): kotlin.Nothing [inline] declared in kotlin.StandardKt' type=kotlin.Nothing origin=null
@@ -315,8 +307,6 @@ FILE fqName:<root> fileName:/castsInsideCoroutineInference.kt
     TYPE_PARAMETER name:E index:0 variance: superTypes:[kotlin.Any?] reified:false
     $receiver: VALUE_PARAMETER name:<this> type:<root>.CoroutineScope
     VALUE_PARAMETER name:block index:0 type:@[ExtensionFunctionType] kotlin.coroutines.SuspendFunction1<<root>.ProducerScope<E of <root>.produce>, kotlin.Unit>
-      annotations:
-        BuilderInference
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun produce <E> (block: @[ExtensionFunctionType] kotlin.coroutines.SuspendFunction1<<root>.ProducerScope<E of <root>.produce>, kotlin.Unit>): <root>.ReceiveChannel<E of <root>.produce> declared in <root>'
         CALL 'public final fun TODO (): kotlin.Nothing [inline] declared in kotlin.StandardKt' type=kotlin.Nothing origin=null
diff --git a/compiler/testData/ir/irText/types/castsInsideCoroutineInference.kt b/compiler/testData/ir/irText/types/castsInsideCoroutineInference.kt
index eee582f4623..15571b77e17 100644
--- a/compiler/testData/ir/irText/types/castsInsideCoroutineInference.kt
+++ b/compiler/testData/ir/irText/types/castsInsideCoroutineInference.kt
@@ -3,7 +3,7 @@
 import kotlin.experimental.ExperimentalTypeInference
 
 @OptIn(ExperimentalTypeInference::class)
-fun <R> scopedFlow(@BuilderInference block: suspend CoroutineScope.(FlowCollector<R>) -> Unit): Flow<R> =
+fun <R> scopedFlow(block: suspend CoroutineScope.(FlowCollector<R>) -> Unit): Flow<R> =
     flow {
         val collector = this
         flowScope { block(collector) }
@@ -22,7 +22,7 @@ suspend fun <T> FlowCollector<T>.invokeSafely(
 }
 
 @OptIn(ExperimentalTypeInference::class)
-inline fun <T> unsafeFlow(@BuilderInference crossinline block: suspend FlowCollector<T>.() -> Unit): Flow<T> = TODO()
+inline fun <T> unsafeFlow(crossinline block: suspend FlowCollector<T>.() -> Unit): Flow<T> = TODO()
 
 @Deprecated(level = DeprecationLevel.HIDDEN, message = "binary compatibility with a version w/o FlowCollector receiver")
 public fun <T> Flow<T>.onCompletion(action: suspend (cause: Throwable?) -> Unit) =
@@ -48,10 +48,10 @@ class SafeCollector<T> constructor(
 }
 
 @OptIn(ExperimentalTypeInference::class)
-fun <T> flow(@BuilderInference block: suspend FlowCollector<T>.() -> Unit): Flow<T> = TODO()
+fun <T> flow(block: suspend FlowCollector<T>.() -> Unit): Flow<T> = TODO()
 
 @OptIn(ExperimentalTypeInference::class)
-suspend fun <R> flowScope(@BuilderInference block: suspend CoroutineScope.() -> R): R = TODO()
+suspend fun <R> flowScope(block: suspend CoroutineScope.() -> R): R = TODO()
 
 suspend inline fun <T> Flow<T>.collect(crossinline action: suspend (value: T) -> Unit) {}
 
@@ -72,7 +72,7 @@ interface ReceiveChannel<out E>
 
 @OptIn(ExperimentalTypeInference::class)
 fun <E> CoroutineScope.produce(
-    @BuilderInference block: suspend ProducerScope<E>.() -> Unit
+    block: suspend ProducerScope<E>.() -> Unit
 ): ReceiveChannel<E> = TODO()
 
 interface ProducerScope<in E> : CoroutineScope, SendChannel<E> {
diff --git a/compiler/testData/ir/irText/types/castsInsideCoroutineInference.kt.txt b/compiler/testData/ir/irText/types/castsInsideCoroutineInference.kt.txt
index 11ecc0bcc6e..4f7582444dc 100644
--- a/compiler/testData/ir/irText/types/castsInsideCoroutineInference.kt.txt
+++ b/compiler/testData/ir/irText/types/castsInsideCoroutineInference.kt.txt
@@ -1,5 +1,5 @@
 @OptIn(markerClass = [ExperimentalTypeInference::class])
-fun <R : Any?> scopedFlow(@BuilderInference block: @ExtensionFunctionType SuspendFunction2<CoroutineScope, FlowCollector<R>, Unit>): Flow<R> {
+fun <R : Any?> scopedFlow(block: @ExtensionFunctionType SuspendFunction2<CoroutineScope, FlowCollector<R>, Unit>): Flow<R> {
   return flow<R>(block = local suspend fun FlowCollector<R>.<anonymous>() {
     val collector: FlowCollector<R> = $this$flow
     flowScope<Unit>(block = local suspend fun CoroutineScope.<anonymous>() {
@@ -22,7 +22,7 @@ suspend fun <T : Any?> FlowCollector<T>.invokeSafely(action: @ExtensionFunctionT
 }
 
 @OptIn(markerClass = [ExperimentalTypeInference::class])
-inline fun <T : Any?> unsafeFlow(@BuilderInference crossinline block: @ExtensionFunctionType SuspendFunction1<FlowCollector<T>, Unit>): Flow<T> {
+inline fun <T : Any?> unsafeFlow(crossinline block: @ExtensionFunctionType SuspendFunction1<FlowCollector<T>, Unit>): Flow<T> {
   return TODO()
 }
 
@@ -84,12 +84,12 @@ class SafeCollector<T : Any?> : FlowCollector<T> {
 }
 
 @OptIn(markerClass = [ExperimentalTypeInference::class])
-fun <T : Any?> flow(@BuilderInference block: @ExtensionFunctionType SuspendFunction1<FlowCollector<T>, Unit>): Flow<T> {
+fun <T : Any?> flow(block: @ExtensionFunctionType SuspendFunction1<FlowCollector<T>, Unit>): Flow<T> {
   return TODO()
 }
 
 @OptIn(markerClass = [ExperimentalTypeInference::class])
-suspend fun <R : Any?> flowScope(@BuilderInference block: @ExtensionFunctionType SuspendFunction1<CoroutineScope, R>): R {
+suspend fun <R : Any?> flowScope(block: @ExtensionFunctionType SuspendFunction1<CoroutineScope, R>): R {
   return TODO()
 }
 
@@ -127,7 +127,7 @@ interface ReceiveChannel<out E : Any?> {
 }
 
 @OptIn(markerClass = [ExperimentalTypeInference::class])
-fun <E : Any?> CoroutineScope.produce(@BuilderInference block: @ExtensionFunctionType SuspendFunction1<ProducerScope<E>, Unit>): ReceiveChannel<E> {
+fun <E : Any?> CoroutineScope.produce(block: @ExtensionFunctionType SuspendFunction1<ProducerScope<E>, Unit>): ReceiveChannel<E> {
   return TODO()
 }
 
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
index f579a6f6aa3..33b324724e4 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
@@ -18923,6 +18923,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             runTest("compiler/testData/codegen/box/inference/builderInferenceLeakingVariable.kt");
         }
 
+        @Test
+        @TestMetadata("builderInferenceWithAnnotation.kt")
+        public void testBuilderInferenceWithAnnotation() throws Exception {
+            runTest("compiler/testData/codegen/box/inference/builderInferenceWithAnnotation.kt");
+        }
+
         @Test
         @TestMetadata("capturedStarProjection.kt")
         public void testCapturedStarProjection() throws Exception {
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
index 53a9993eee5..52d88c35f3e 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
@@ -19397,6 +19397,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             runTest("compiler/testData/codegen/box/inference/builderInferenceLeakingVariable.kt");
         }
 
+        @Test
+        @TestMetadata("builderInferenceWithAnnotation.kt")
+        public void testBuilderInferenceWithAnnotation() throws Exception {
+            runTest("compiler/testData/codegen/box/inference/builderInferenceWithAnnotation.kt");
+        }
+
         @Test
         @TestMetadata("capturedStarProjection.kt")
         public void testCapturedStarProjection() throws Exception {
diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
index 48fb4ac18d8..44ce08ef38b 100644
--- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
+++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
@@ -15743,6 +15743,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             runTest("compiler/testData/codegen/box/inference/builderInferenceLeakingVariable.kt");
         }
 
+        @TestMetadata("builderInferenceWithAnnotation.kt")
+        public void testBuilderInferenceWithAnnotation() throws Exception {
+            runTest("compiler/testData/codegen/box/inference/builderInferenceWithAnnotation.kt");
+        }
+
         @TestMetadata("capturedStarProjection.kt")
         public void testCapturedStarProjection() throws Exception {
             runTest("compiler/testData/codegen/box/inference/capturedStarProjection.kt");