Skip to content

Commit f5189cc

Browse files
committed
fixup! Start using Stability.Runtime more broadly
Fix how the file containing the call is found in `ComposableFunctionBodyTransformer.visitComposableCall`
1 parent c07ae7a commit f5189cc

File tree

52 files changed

+100
-97
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+100
-97
lines changed

plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ContextParametersTransformTests/testContextReceiversNestedWith.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ fun Test(foo: Foo, %composer: Composer?, %changed: Int) {
3737
traceEventStart(<>, %dirty, -1, <>)
3838
}
3939
with(foo) {
40-
A(%this%with, %composer, 0)
40+
A(%this%with, %composer, %stable)
4141
%composer.startReplaceGroup(<>)
4242
sourceInformation(%composer, "*<B()>")
4343
with(Bar()) {
44-
B(%this%with@Test.<anonymous>, %this%with, %composer, 0)
44+
B(%this%with@Test.<anonymous>, %this%with, %composer, %stable or %stable shl 0b0011)
4545
}
4646
%composer.endReplaceGroup()
4747
}

plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ContextParametersTransformTests/testContextReceiversWith.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ fun Test(foo: Foo, %composer: Composer?, %changed: Int) {
3535
traceEventStart(<>, %dirty, -1, <>)
3636
}
3737
with(foo) {
38-
A(%this%with, %composer, 0)
38+
A(%this%with, %composer, %stable)
3939
}
4040
if (isTraceInProgress()) {
4141
traceEventEnd()

plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ContextParametersTransformTests/testContextReceiversWithAndDefaultParam.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ fun Test(foo: Foo, %composer: Composer?, %changed: Int) {
3434
traceEventStart(<>, %dirty, -1, <>)
3535
}
3636
with(foo) {
37-
"Hello".A(%this%with, 2, null, %composer, 0b000110110000, 0b0010)
37+
"Hello".A(%this%with, 2, null, %composer, 0b000110110000 or %stable, 0b0010)
3838
}
3939
if (isTraceInProgress()) {
4040
traceEventEnd()

plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ControlFlowTransformTests/testGroupAroundExtensionFunctions[useFir = false].txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ fun Test(start: Int, end: Int, %composer: Composer?, %changed: Int) {
4545
val <iterator> = start until end.iterator()
4646
while (<iterator>.hasNext()) {
4747
val i = <iterator>.next()
48-
val b = a.get(bKey, %composer, 0b00110000)
48+
val b = a.get(bKey, %composer, 0b00110000 or %stable)
4949
if (i == 0b0010) {
5050
%composer.startReplaceGroup(<>)
5151
sourceInformation(%composer, "<get(cK...>")
52-
a.get(cKey, %composer, 0b00110000)
52+
a.get(cKey, %composer, 0b00110000 or %stable)
5353
%composer.endReplaceGroup()
5454
} else {
5555
%composer.startReplaceGroup(<>)

plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ControlFlowTransformTests/testGroupAroundExtensionFunctions[useFir = true].txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ fun Test(start: Int, end: Int, %composer: Composer?, %changed: Int) {
4545
val <iterator> = start until end.iterator()
4646
while (<iterator>.hasNext()) {
4747
val i = <iterator>.next()
48-
val b = a.get(bKey, %composer, 0b00110000)
48+
val b = a.get(bKey, %composer, 0b00110000 or %stable)
4949
if (i == 0b0010) {
5050
%composer.startReplaceGroup(<>)
5151
sourceInformation(%composer, "<get(cK...>")
52-
a.get(cKey, %composer, 0b00110000)
52+
a.get(cKey, %composer, 0b00110000 or %stable)
5353
%composer.endReplaceGroup()
5454
} else {
5555
%composer.startReplaceGroup(<>)

plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.DefaultParamTransformTests/testDefaultArgsOnInvoke[useFir = false].txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ fun Bar(%composer: Composer?, %changed: Int) {
2424
if (isTraceInProgress()) {
2525
traceEventStart(<>, %changed, -1, <>)
2626
}
27-
HasDefault(null, %composer, 0b00110000, 0b0001)
28-
NoDefault("Some Text", %composer, 0b00110110)
29-
MultipleDefault(null, 0, %composer, 0b000110000000, 0b0011)
27+
HasDefault(null, %composer, %stable shl 0b0011, 0b0001)
28+
NoDefault("Some Text", %composer, 0b0110 or %stable shl 0b0011)
29+
MultipleDefault(null, 0, %composer, %stable shl 0b0110, 0b0011)
3030
if (isTraceInProgress()) {
3131
traceEventEnd()
3232
}

plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.DefaultParamTransformTests/testDefaultArgsOnInvoke[useFir = true].txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ fun Bar(%composer: Composer?, %changed: Int) {
2424
if (isTraceInProgress()) {
2525
traceEventStart(<>, %changed, -1, <>)
2626
}
27-
HasDefault(null, %composer, 0b00110000, 0b0001)
28-
NoDefault("Some Text", %composer, 0b00110110)
29-
MultipleDefault(null, 0, %composer, 0b000110000000, 0b0011)
27+
HasDefault(null, %composer, %stable shl 0b0011, 0b0001)
28+
NoDefault("Some Text", %composer, 0b0110 or %stable shl 0b0011)
29+
MultipleDefault(null, 0, %composer, %stable shl 0b0110, 0b0011)
3030
if (isTraceInProgress()) {
3131
traceEventEnd()
3232
}

plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.FunctionBodySkippingTransformTests/testComposableLambdaWithUnstableParams[useFir = false].txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ internal object ComposableSingletons%TestKt {
3737
traceEventStart(<>, %dirty, -1, <>)
3838
}
3939
A(x, %composer, 0b1110 and %dirty)
40-
B(y, %composer, 0b1110 and %dirty shr 0b0011)
40+
B(y, %composer, %stable or 0b1110 and %dirty shr 0b0011)
4141
if (isTraceInProgress()) {
4242
traceEventEnd()
4343
}

plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.FunctionBodySkippingTransformTests/testComposableLambdaWithUnstableParams[useFir = true].txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ internal object ComposableSingletons%TestKt {
3737
traceEventStart(<>, %dirty, -1, <>)
3838
}
3939
A(x, %composer, 0b1110 and %dirty)
40-
B(y, %composer, 0b1110 and %dirty shr 0b0011)
40+
B(y, %composer, %stable or 0b1110 and %dirty shr 0b0011)
4141
if (isTraceInProgress()) {
4242
traceEventEnd()
4343
}

plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.FunctionBodySkippingTransformTests/testManyNonOptionalParams[useFir = false].txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ fun Test(a: Int, b: Boolean, c: Int, d: Foo?, e: List<Int>?, %composer: Composer
7373
if (isTraceInProgress()) {
7474
traceEventStart(<>, %dirty, -1, <>)
7575
}
76-
A(a, b, c, d as Foo, e as List<Int>, %composer, 0b1110 and %dirty or 0b01110000 and %dirty or 0b001110000000 and %dirty or 0b0001110000000000 and %dirty or 0b1110000000000000 and %dirty)
76+
A(a, b, c, d as Foo, e as List<Int>, %composer, 0b1110 and %dirty or 0b01110000 and %dirty or 0b001110000000 and %dirty or %stable shl 0b1001 or 0b0001110000000000 and %dirty or 0b1110000000000000 and %dirty)
7777
if (isTraceInProgress()) {
7878
traceEventEnd()
7979
}

0 commit comments

Comments
 (0)