[FE] Remove BuilderInference annotation from tests

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
 

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
 

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

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>>

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>>

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
 

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)

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)

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>()

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(

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())
         }
     )
 }

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

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)

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> {

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> {

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> {

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>
 

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> {

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)
 

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)

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)

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

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>
 

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>
 

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

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>
 

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>
 

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

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>
 

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>
 

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

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>
 

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>
 

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

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>
 

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>
 

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

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>
 

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>
 

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

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() {}

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() {}

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

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 {

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 {

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> {

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>

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>

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
 

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)

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>()

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)

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>()

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 {

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>()

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 {

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 {

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>()

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)

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>()

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)

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>()

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> {

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

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)

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> {

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())

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

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

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 {

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))

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>()

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)

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

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 {

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 {

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

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

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() {}

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
 

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
 

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 {

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> {

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>
 

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> {