From 38084f071463e1af30fc89cc57ec5921eaa08bcb Mon Sep 17 00:00:00 2001 From: Andrei Shikov Date: Tue, 10 Sep 2024 23:01:34 +0100 Subject: [PATCH] Enable source information for getters and other special-named functions Excludes anonymous/lambda functions to prevent noise and significant binary increase. --- .../testCallingProperties[useFir = false].txt | 2 +- .../testCallingProperties[useFir = true].txt | 2 +- .../testDelegateCall[useFir = false].txt | 6 +++--- .../testDelegateCall[useFir = true].txt | 6 +++--- .../testDexNaming[useFir = false].txt | 2 +- .../testDexNaming[useFir = true].txt | 2 +- .../testStableDelegateCall[useFir = false].txt | 2 +- .../testStableDelegateCall[useFir = true].txt | 2 +- .../testUnstableDelegateCall[useFir = false].txt | 2 +- .../testUnstableDelegateCall[useFir = true].txt | 2 +- ...InAnonymousObjectDelegate[useFir = false].txt | 2 +- ...eInAnonymousObjectDelegate[useFir = true].txt | 2 +- ...neReadOnlySourceLocations[useFir = false].txt | 2 +- ...ineReadOnlySourceLocations[useFir = true].txt | 2 +- ...yInlineValSourceLocations[useFir = false].txt | 4 ++-- ...lyInlineValSourceLocations[useFir = true].txt | 4 ++-- .../testGrouplessProperty[useFir = false].txt | 2 +- .../testGrouplessProperty[useFir = true].txt | 2 +- .../lower/ComposableFunctionBodyTransformer.kt | 16 ++++++++++------ 19 files changed, 34 insertions(+), 30 deletions(-) diff --git a/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ComposerParamTransformTests/testCallingProperties[useFir = false].txt b/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ComposerParamTransformTests/testCallingProperties[useFir = false].txt index dc0b8cf7ab15f..21977fb61917e 100644 --- a/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ComposerParamTransformTests/testCallingProperties[useFir = false].txt +++ b/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ComposerParamTransformTests/testCallingProperties[useFir = false].txt @@ -26,7 +26,7 @@ val bar: Int @Composable get() { return 123 } val bar: Int @Composable @JvmName(name = "getBar") get() { - sourceInformationMarkerStart(%composer, <>, "C:Test.kt#2487m") + sourceInformationMarkerStart(%composer, <>, "C():Test.kt#2487m") if (isTraceInProgress()) { traceEventStart(<>, %changed, -1, <>) } diff --git a/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ComposerParamTransformTests/testCallingProperties[useFir = true].txt b/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ComposerParamTransformTests/testCallingProperties[useFir = true].txt index dc0b8cf7ab15f..21977fb61917e 100644 --- a/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ComposerParamTransformTests/testCallingProperties[useFir = true].txt +++ b/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ComposerParamTransformTests/testCallingProperties[useFir = true].txt @@ -26,7 +26,7 @@ val bar: Int @Composable get() { return 123 } val bar: Int @Composable @JvmName(name = "getBar") get() { - sourceInformationMarkerStart(%composer, <>, "C:Test.kt#2487m") + sourceInformationMarkerStart(%composer, <>, "C():Test.kt#2487m") if (isTraceInProgress()) { traceEventStart(<>, %changed, -1, <>) } diff --git a/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ComposerParamTransformTests/testDelegateCall[useFir = false].txt b/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ComposerParamTransformTests/testDelegateCall[useFir = false].txt index 9e6e09c0f2f7c..6a18197d15ad3 100644 --- a/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ComposerParamTransformTests/testDelegateCall[useFir = false].txt +++ b/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ComposerParamTransformTests/testDelegateCall[useFir = false].txt @@ -82,7 +82,7 @@ class Bar { val foo: Foo = Foo() @Composable @JvmName(name = "getFoo") get() { - sourceInformationMarkerStart(%composer, <>, "C:Test.kt#2487m") + sourceInformationMarkerStart(%composer, <>, "C():Test.kt#2487m") if (isTraceInProgress()) { traceEventStart(<>, %changed, -1, <>) } @@ -107,7 +107,7 @@ fun test(%composer: Composer?, %changed: Int) { val foo%delegate = Foo() @Composable get(%composer: Composer?, %changed: Int) { - sourceInformationMarkerStart(%composer, <>, "C:Test.kt#2487m") + sourceInformationMarkerStart(%composer, <>, "C():Test.kt#2487m") if (isTraceInProgress()) { traceEventStart(<>, %changed, -1, <>) } @@ -123,7 +123,7 @@ fun test(%composer: Composer?, %changed: Int) { val fooDelegate%delegate = FooDelegate() @Composable get(%composer: Composer?, %changed: Int) { - sourceInformationMarkerStart(%composer, <>, "C:Test.kt#2487m") + sourceInformationMarkerStart(%composer, <>, "C():Test.kt#2487m") if (isTraceInProgress()) { traceEventStart(<>, %changed, -1, <>) } diff --git a/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ComposerParamTransformTests/testDelegateCall[useFir = true].txt b/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ComposerParamTransformTests/testDelegateCall[useFir = true].txt index 9e6e09c0f2f7c..6a18197d15ad3 100644 --- a/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ComposerParamTransformTests/testDelegateCall[useFir = true].txt +++ b/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ComposerParamTransformTests/testDelegateCall[useFir = true].txt @@ -82,7 +82,7 @@ class Bar { val foo: Foo = Foo() @Composable @JvmName(name = "getFoo") get() { - sourceInformationMarkerStart(%composer, <>, "C:Test.kt#2487m") + sourceInformationMarkerStart(%composer, <>, "C():Test.kt#2487m") if (isTraceInProgress()) { traceEventStart(<>, %changed, -1, <>) } @@ -107,7 +107,7 @@ fun test(%composer: Composer?, %changed: Int) { val foo%delegate = Foo() @Composable get(%composer: Composer?, %changed: Int) { - sourceInformationMarkerStart(%composer, <>, "C:Test.kt#2487m") + sourceInformationMarkerStart(%composer, <>, "C():Test.kt#2487m") if (isTraceInProgress()) { traceEventStart(<>, %changed, -1, <>) } @@ -123,7 +123,7 @@ fun test(%composer: Composer?, %changed: Int) { val fooDelegate%delegate = FooDelegate() @Composable get(%composer: Composer?, %changed: Int) { - sourceInformationMarkerStart(%composer, <>, "C:Test.kt#2487m") + sourceInformationMarkerStart(%composer, <>, "C():Test.kt#2487m") if (isTraceInProgress()) { traceEventStart(<>, %changed, -1, <>) } diff --git a/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ComposerParamTransformTests/testDexNaming[useFir = false].txt b/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ComposerParamTransformTests/testDexNaming[useFir = false].txt index 22f4969a3b04a..49a44ed89012f 100644 --- a/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ComposerParamTransformTests/testDexNaming[useFir = false].txt +++ b/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ComposerParamTransformTests/testDexNaming[useFir = false].txt @@ -24,7 +24,7 @@ val myProperty: () -> Unit @Composable get() { val myProperty: Function0 @Composable @JvmName(name = "getMyProperty") get() { - sourceInformationMarkerStart(%composer, <>, "C:Test.kt#2487m") + sourceInformationMarkerStart(%composer, <>, "C():Test.kt#2487m") if (isTraceInProgress()) { traceEventStart(<>, %changed, -1, <>) } diff --git a/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ComposerParamTransformTests/testDexNaming[useFir = true].txt b/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ComposerParamTransformTests/testDexNaming[useFir = true].txt index a7575b3c2fbd7..bca9bdbb4a9e0 100644 --- a/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ComposerParamTransformTests/testDexNaming[useFir = true].txt +++ b/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ComposerParamTransformTests/testDexNaming[useFir = true].txt @@ -24,7 +24,7 @@ val myProperty: () -> Unit @Composable get() { val myProperty: Function0 @Composable @JvmName(name = "getMyProperty") get() { - sourceInformationMarkerStart(%composer, <>, "C<{>:Test.kt#2487m") + sourceInformationMarkerStart(%composer, <>, "C()<{>:Test.kt#2487m") if (isTraceInProgress()) { traceEventStart(<>, %changed, -1, <>) } diff --git a/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ComposerParamTransformTests/testStableDelegateCall[useFir = false].txt b/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ComposerParamTransformTests/testStableDelegateCall[useFir = false].txt index 5ed7bbfb0c315..c95ff3fd38d99 100644 --- a/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ComposerParamTransformTests/testStableDelegateCall[useFir = false].txt +++ b/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ComposerParamTransformTests/testStableDelegateCall[useFir = false].txt @@ -57,7 +57,7 @@ fun test(foo: Foo, %composer: Composer?, %changed: Int) { val delegated%delegate = foo @Composable get(%composer: Composer?, %changed: Int) { - sourceInformationMarkerStart(%composer, <>, "C:Test.kt#2487m") + sourceInformationMarkerStart(%composer, <>, "C():Test.kt#2487m") if (isTraceInProgress()) { traceEventStart(<>, %changed, -1, <>) } diff --git a/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ComposerParamTransformTests/testStableDelegateCall[useFir = true].txt b/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ComposerParamTransformTests/testStableDelegateCall[useFir = true].txt index 5ed7bbfb0c315..c95ff3fd38d99 100644 --- a/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ComposerParamTransformTests/testStableDelegateCall[useFir = true].txt +++ b/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ComposerParamTransformTests/testStableDelegateCall[useFir = true].txt @@ -57,7 +57,7 @@ fun test(foo: Foo, %composer: Composer?, %changed: Int) { val delegated%delegate = foo @Composable get(%composer: Composer?, %changed: Int) { - sourceInformationMarkerStart(%composer, <>, "C:Test.kt#2487m") + sourceInformationMarkerStart(%composer, <>, "C():Test.kt#2487m") if (isTraceInProgress()) { traceEventStart(<>, %changed, -1, <>) } diff --git a/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ComposerParamTransformTests/testUnstableDelegateCall[useFir = false].txt b/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ComposerParamTransformTests/testUnstableDelegateCall[useFir = false].txt index 7d4053a34eaf1..3cc7406325902 100644 --- a/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ComposerParamTransformTests/testUnstableDelegateCall[useFir = false].txt +++ b/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ComposerParamTransformTests/testUnstableDelegateCall[useFir = false].txt @@ -56,7 +56,7 @@ fun test(%composer: Composer?, %changed: Int) { val foo%delegate = Foo() @Composable get(%composer: Composer?, %changed: Int) { - sourceInformationMarkerStart(%composer, <>, "C:Test.kt#2487m") + sourceInformationMarkerStart(%composer, <>, "C():Test.kt#2487m") if (isTraceInProgress()) { traceEventStart(<>, %changed, -1, <>) } diff --git a/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ComposerParamTransformTests/testUnstableDelegateCall[useFir = true].txt b/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ComposerParamTransformTests/testUnstableDelegateCall[useFir = true].txt index 7d4053a34eaf1..3cc7406325902 100644 --- a/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ComposerParamTransformTests/testUnstableDelegateCall[useFir = true].txt +++ b/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ComposerParamTransformTests/testUnstableDelegateCall[useFir = true].txt @@ -56,7 +56,7 @@ fun test(%composer: Composer?, %changed: Int) { val foo%delegate = Foo() @Composable get(%composer: Composer?, %changed: Int) { - sourceInformationMarkerStart(%composer, <>, "C:Test.kt#2487m") + sourceInformationMarkerStart(%composer, <>, "C():Test.kt#2487m") if (isTraceInProgress()) { traceEventStart(<>, %changed, -1, <>) } diff --git a/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ControlFlowTransformTests/testComposableInAnonymousObjectDelegate[useFir = false].txt b/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ControlFlowTransformTests/testComposableInAnonymousObjectDelegate[useFir = false].txt index aee5bdf8d30a1..ae642f774a78e 100644 --- a/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ControlFlowTransformTests/testComposableInAnonymousObjectDelegate[useFir = false].txt +++ b/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ControlFlowTransformTests/testComposableInAnonymousObjectDelegate[useFir = false].txt @@ -25,7 +25,7 @@ interface B { @Composable @JvmName(name = "getProperty") get() { %composer.startReplaceGroup(<>) - sourceInformation(%composer, "C:Test.kt") + sourceInformation(%composer, "C():Test.kt") if (isTraceInProgress()) { traceEventStart(<>, %changed, -1, <>) } diff --git a/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ControlFlowTransformTests/testComposableInAnonymousObjectDelegate[useFir = true].txt b/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ControlFlowTransformTests/testComposableInAnonymousObjectDelegate[useFir = true].txt index aee5bdf8d30a1..ae642f774a78e 100644 --- a/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ControlFlowTransformTests/testComposableInAnonymousObjectDelegate[useFir = true].txt +++ b/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ControlFlowTransformTests/testComposableInAnonymousObjectDelegate[useFir = true].txt @@ -25,7 +25,7 @@ interface B { @Composable @JvmName(name = "getProperty") get() { %composer.startReplaceGroup(<>) - sourceInformation(%composer, "C:Test.kt") + sourceInformation(%composer, "C():Test.kt") if (isTraceInProgress()) { traceEventStart(<>, %changed, -1, <>) } diff --git a/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ControlFlowTransformTests/testInlineReadOnlySourceLocations[useFir = false].txt b/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ControlFlowTransformTests/testInlineReadOnlySourceLocations[useFir = false].txt index af124b2849e97..3c3ba770ee29c 100644 --- a/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ControlFlowTransformTests/testInlineReadOnlySourceLocations[useFir = false].txt +++ b/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ControlFlowTransformTests/testInlineReadOnlySourceLocations[useFir = false].txt @@ -32,7 +32,7 @@ fun Test() { val current: Int @Composable @ReadOnlyComposable @JvmName(name = "getCurrent") get() { - sourceInformationMarkerStart(%composer, <>, "C:Test.kt") + sourceInformationMarkerStart(%composer, <>, "C():Test.kt") if (isTraceInProgress()) { traceEventStart(<>, %changed, -1, " (Test.kt:7)") } diff --git a/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ControlFlowTransformTests/testInlineReadOnlySourceLocations[useFir = true].txt b/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ControlFlowTransformTests/testInlineReadOnlySourceLocations[useFir = true].txt index af124b2849e97..3c3ba770ee29c 100644 --- a/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ControlFlowTransformTests/testInlineReadOnlySourceLocations[useFir = true].txt +++ b/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ControlFlowTransformTests/testInlineReadOnlySourceLocations[useFir = true].txt @@ -32,7 +32,7 @@ fun Test() { val current: Int @Composable @ReadOnlyComposable @JvmName(name = "getCurrent") get() { - sourceInformationMarkerStart(%composer, <>, "C:Test.kt") + sourceInformationMarkerStart(%composer, <>, "C():Test.kt") if (isTraceInProgress()) { traceEventStart(<>, %changed, -1, " (Test.kt:7)") } diff --git a/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ControlFlowTransformTests/testReadOnlyInlineValSourceLocations[useFir = false].txt b/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ControlFlowTransformTests/testReadOnlyInlineValSourceLocations[useFir = false].txt index 9949f5d363b84..5e972c1b4c33f 100644 --- a/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ControlFlowTransformTests/testReadOnlyInlineValSourceLocations[useFir = false].txt +++ b/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ControlFlowTransformTests/testReadOnlyInlineValSourceLocations[useFir = false].txt @@ -46,7 +46,7 @@ class CurrentHolder { val current: Int @ReadOnlyComposable @Composable @JvmName(name = "getCurrent") get() { - sourceInformationMarkerStart(%composer, <>, "CC:Test.kt") + sourceInformationMarkerStart(%composer, <>, "CC():Test.kt") val tmp0 = 0 sourceInformationMarkerEnd(%composer) return tmp0 @@ -59,7 +59,7 @@ class HolderHolder { val current: Int @ReadOnlyComposable @Composable @JvmName(name = "getCurrent") get() { - sourceInformationMarkerStart(%composer, <>, "C:Test.kt") + sourceInformationMarkerStart(%composer, <>, "C():Test.kt") if (isTraceInProgress()) { traceEventStart(<>, %changed, -1, "HolderHolder. (Test.kt:16)") } diff --git a/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ControlFlowTransformTests/testReadOnlyInlineValSourceLocations[useFir = true].txt b/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ControlFlowTransformTests/testReadOnlyInlineValSourceLocations[useFir = true].txt index 9949f5d363b84..5e972c1b4c33f 100644 --- a/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ControlFlowTransformTests/testReadOnlyInlineValSourceLocations[useFir = true].txt +++ b/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.ControlFlowTransformTests/testReadOnlyInlineValSourceLocations[useFir = true].txt @@ -46,7 +46,7 @@ class CurrentHolder { val current: Int @ReadOnlyComposable @Composable @JvmName(name = "getCurrent") get() { - sourceInformationMarkerStart(%composer, <>, "CC:Test.kt") + sourceInformationMarkerStart(%composer, <>, "CC():Test.kt") val tmp0 = 0 sourceInformationMarkerEnd(%composer) return tmp0 @@ -59,7 +59,7 @@ class HolderHolder { val current: Int @ReadOnlyComposable @Composable @JvmName(name = "getCurrent") get() { - sourceInformationMarkerStart(%composer, <>, "C:Test.kt") + sourceInformationMarkerStart(%composer, <>, "C():Test.kt") if (isTraceInProgress()) { traceEventStart(<>, %changed, -1, "HolderHolder. (Test.kt:16)") } diff --git a/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.FunctionBodySkippingTransformTests/testGrouplessProperty[useFir = false].txt b/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.FunctionBodySkippingTransformTests/testGrouplessProperty[useFir = false].txt index dfc11c84bcdec..31b4a12094a21 100644 --- a/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.FunctionBodySkippingTransformTests/testGrouplessProperty[useFir = false].txt +++ b/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.FunctionBodySkippingTransformTests/testGrouplessProperty[useFir = false].txt @@ -32,7 +32,7 @@ open class Foo { val current: Int @Composable @ReadOnlyComposable @JvmName(name = "getCurrent") get() { - sourceInformationMarkerStart(%composer, <>, "CC:Test.kt") + sourceInformationMarkerStart(%composer, <>, "CC():Test.kt") val tmp0 = %composer.hashCode() sourceInformationMarkerEnd(%composer) return tmp0 diff --git a/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.FunctionBodySkippingTransformTests/testGrouplessProperty[useFir = true].txt b/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.FunctionBodySkippingTransformTests/testGrouplessProperty[useFir = true].txt index dfc11c84bcdec..31b4a12094a21 100644 --- a/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.FunctionBodySkippingTransformTests/testGrouplessProperty[useFir = true].txt +++ b/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/resources/golden/androidx.compose.compiler.plugins.kotlin.FunctionBodySkippingTransformTests/testGrouplessProperty[useFir = true].txt @@ -32,7 +32,7 @@ open class Foo { val current: Int @Composable @ReadOnlyComposable @JvmName(name = "getCurrent") get() { - sourceInformationMarkerStart(%composer, <>, "CC:Test.kt") + sourceInformationMarkerStart(%composer, <>, "CC():Test.kt") val tmp0 = %composer.hashCode() sourceInformationMarkerEnd(%composer) return tmp0 diff --git a/plugins/compose/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/ComposableFunctionBodyTransformer.kt b/plugins/compose/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/ComposableFunctionBodyTransformer.kt index 525e05ffe1bee..2a1b6a34b5828 100644 --- a/plugins/compose/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/ComposableFunctionBodyTransformer.kt +++ b/plugins/compose/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/ComposableFunctionBodyTransformer.kt @@ -4761,12 +4761,16 @@ private fun mutableStatementContainer(context: IrPluginContext): IrContainerExpr ) } -private fun IrFunction.callInformation(): String { - val inlineMarker = if (isInline) "C" else "" - return if (!name.isSpecial) - "${inlineMarker}C(${name.asString()})" - else "${inlineMarker}C" -} +private fun IrFunction.callInformation(): String = + buildString { + append('C') + if (isInline) append('C') + if (!isLambda()) { + append('(') + append(name.asString()) + append(')') + } + } // Parameter information is an index from the sorted order of the parameters to the // actual order. This is used to reorder the fields of the lambda class generated for