Skip to content

[compiler] Flatten scopes based on fallthrough, not scope range #30398

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 24, 2024
Merged

[compiler] Flatten scopes based on fallthrough, not scope range #30398

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
421b3e7
[compiler] Flatten scopes based on fallthrough, not scope range
josephsavona Jul 19, 2024
6a357e7
Update on "[compiler] Flatten scopes based on fallthrough, not scope …
josephsavona Jul 19, 2024
d45ce65
rebase on "[compiler] Flatten scopes based on fallthrough, not scope …
josephsavona Jul 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions ...packages/babel-plugin-react-compiler/src/ReactiveScopes/FlattenScopesWithHooksOrUseHIR.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import {
HIRFunction,
LabelTerminal,
PrunedScopeTerminal,
ReactiveScope,
getHookKind,
isUseOperator,
} from '../HIR';
Expand Down Expand Up @@ -39,12 +38,11 @@ import {retainWhere} from '../Utils/utils';
* to ensure the hook call does not inadvertently become conditional.
*/
export function flattenScopesWithHooksOrUseHIR(fn: HIRFunction): void {
const activeScopes: Array<{block: BlockId; scope: ReactiveScope}> = [];
const activeScopes: Array<{block: BlockId; fallthrough: BlockId}> = [];
const prune: Array<BlockId> = [];

for (const [, block] of fn.body.blocks) {
const firstId = block.instructions[0]?.id ?? block.terminal.id;
retainWhere(activeScopes, current => current.scope.range.end > firstId);
retainWhere(activeScopes, current => current.fallthrough !== block.id);

for (const instr of block.instructions) {
const {value} = instr;
Expand All @@ -66,7 +64,7 @@ export function flattenScopesWithHooksOrUseHIR(fn: HIRFunction): void {
if (block.terminal.kind === 'scope') {
activeScopes.push({
block: block.id,
scope: block.terminal.scope,
fallthrough: block.terminal.fallthrough,
});
}
}
Expand Down