-
Notifications
You must be signed in to change notification settings - Fork 5.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix endToMarker call with inline lambda return
endToMarker call was not generated correctly when trace markers were disabled Fixes: [346808602](https://issuetracker.google.com/346808602) Relnote: Fixes `endToMarker` generation in early return from inline lambdas that caused start/end imbalance.
- Loading branch information
Showing
6 changed files
with
180 additions
and
127 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
51 changes: 51 additions & 0 deletions
51
...s.kotlin.ControlFlowTransformTestsNoSource/returnFromIfInlineNoinline[useFir = false].txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| // | ||
| // Source | ||
| // ------------------------------------------ | ||
|
|
||
| import androidx.compose.runtime.* | ||
| import androidx.compose.foundation.layout.* | ||
|
|
||
| @Composable | ||
| fun Label(test: Boolean) { | ||
| OuterComposableFunction { | ||
| Column { | ||
| if (test) return@OuterComposableFunction | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // | ||
| // Transformed IR | ||
| // ------------------------------------------ | ||
|
|
||
| @Composable | ||
| @ComposableTarget(applier = "androidx.compose.ui.UiComposable") | ||
| fun Label(test: Boolean, %composer: Composer?, %changed: Int) { | ||
| %composer = %composer.startRestartGroup(<>) | ||
| val %dirty = %changed | ||
| if (%changed and 0b1110 == 0) { | ||
| %dirty = %dirty or if (%composer.changed(test)) 0b0100 else 0b0010 | ||
| } | ||
| if (%dirty and 0b1011 != 0b0010 || !%composer.skipping) { | ||
| OuterComposableFunction(rememberComposableLambda(<>, true, { %composer: Composer?, %changed: Int -> | ||
| val tmp0_marker = %composer.currentMarker | ||
| if (%changed and 0b1011 != 0b0010 || !%composer.skipping) { | ||
| Column(null, null, null, { %composer: Composer?, %changed: Int -> | ||
| %composer.startReplaceGroup(<>) | ||
| if (test) { | ||
| %composer.endToMarker(tmp0_marker) | ||
| return@rememberComposableLambda | ||
| } | ||
| %composer.endReplaceGroup() | ||
| }, %composer, 0, 0b0111) | ||
| } else { | ||
| %composer.skipToGroupEnd() | ||
| } | ||
| }, %composer, 0b00110110), %composer, 0b0110) | ||
| } else { | ||
| %composer.skipToGroupEnd() | ||
| } | ||
| %composer.endRestartGroup()?.updateScope { %composer: Composer?, %force: Int -> | ||
| Label(test, %composer, updateChangedFlags(%changed or 0b0001)) | ||
| } | ||
| } |
51 changes: 51 additions & 0 deletions
51
...ns.kotlin.ControlFlowTransformTestsNoSource/returnFromIfInlineNoinline[useFir = true].txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| // | ||
| // Source | ||
| // ------------------------------------------ | ||
|
|
||
| import androidx.compose.runtime.* | ||
| import androidx.compose.foundation.layout.* | ||
|
|
||
| @Composable | ||
| fun Label(test: Boolean) { | ||
| OuterComposableFunction { | ||
| Column { | ||
| if (test) return@OuterComposableFunction | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // | ||
| // Transformed IR | ||
| // ------------------------------------------ | ||
|
|
||
| @Composable | ||
| @ComposableTarget(applier = "androidx.compose.ui.UiComposable") | ||
| fun Label(test: Boolean, %composer: Composer?, %changed: Int) { | ||
| %composer = %composer.startRestartGroup(<>) | ||
| val %dirty = %changed | ||
| if (%changed and 0b1110 == 0) { | ||
| %dirty = %dirty or if (%composer.changed(test)) 0b0100 else 0b0010 | ||
| } | ||
| if (%dirty and 0b1011 != 0b0010 || !%composer.skipping) { | ||
| OuterComposableFunction(rememberComposableLambda(<>, true, { %composer: Composer?, %changed: Int -> | ||
| val tmp0_marker = %composer.currentMarker | ||
| if (%changed and 0b1011 != 0b0010 || !%composer.skipping) { | ||
| Column(null, null, null, { %composer: Composer?, %changed: Int -> | ||
| %composer.startReplaceGroup(<>) | ||
| if (test) { | ||
| %composer.endToMarker(tmp0_marker) | ||
| return@rememberComposableLambda | ||
| } | ||
| %composer.endReplaceGroup() | ||
| }, %composer, 0, 0b0111) | ||
| } else { | ||
| %composer.skipToGroupEnd() | ||
| } | ||
| }, %composer, 0b00110110), %composer, 0b0110) | ||
| } else { | ||
| %composer.skipToGroupEnd() | ||
| } | ||
| %composer.endRestartGroup()?.updateScope { %composer: Composer?, %force: Int -> | ||
| Label(test, %composer, updateChangedFlags(%changed or 0b0001)) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters