[compiler] Support optional/logical/etc within try/catch#35606
Merged
josephsavona merged 5 commits intofacebook:mainfrom Feb 2, 2026
Merged
Conversation
ffa4d6e to
79e188d
Compare
josephsavona
commented
Jan 24, 2026
...kages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/try-catch-optional-call.js
Outdated
Show resolved
Hide resolved
josephsavona
commented
Jan 24, 2026
.../babel-plugin-react-compiler/src/__tests__/fixtures/compiler/try-catch-nullish-coalescing.js
Outdated
Show resolved
Hide resolved
415755c to
037094a
Compare
Control-flow expressions such as logicals, optionals, and ternaries were not supported within try/catch. BuildReactiveFunction recursively traversed these terminals, and was not expecting their condition blocks to end in a maybe-throw terminal, which can occur due to the try/catch. The fix here is to treat the maybe-throw similarly to goto, passing through to the continuation block.
7647849 to
6d10319
Compare
6d10319 to
257dc27
Compare
4 tasks
github-actions bot
pushed a commit
that referenced
this pull request
Feb 2, 2026
Adds support for value terminals (optional/logical/ternary/sequence) within try/catch clauses. Try/catch expressions insert maybe-throw terminals after each instruction, but BuildReactiveFunction's value block extraction was not expecting these terminals. The fix is to roughly treat maybe-throw similarly to goto, falling through to the continuation block, but there are a few edge cases to handle. I've also added extensive tests, including testing that errors correctly flow to the catch handler. DiffTrain build for [b8a6bfa](b8a6bfa)
github-actions bot
pushed a commit
that referenced
this pull request
Feb 2, 2026
Adds support for value terminals (optional/logical/ternary/sequence) within try/catch clauses. Try/catch expressions insert maybe-throw terminals after each instruction, but BuildReactiveFunction's value block extraction was not expecting these terminals. The fix is to roughly treat maybe-throw similarly to goto, falling through to the continuation block, but there are a few edge cases to handle. I've also added extensive tests, including testing that errors correctly flow to the catch handler. DiffTrain build for [b8a6bfa](b8a6bfa)
josephsavona
added a commit
to josephsavona/react
that referenced
this pull request
Feb 2, 2026
The previous PR (facebook#35606) handled maybe-throw terminals within value blocks, and the changes there also made BuildReactiveFunction able to handle sequential optionals. However, CollectOptionalChainDependencies doesn't yet handle sequential value blocks, like `foo(a?.b, b?.c) ?? {}`. This PR fixes the remaining case, which means we should no longer have arbitrary limitations around value blocks.
josephsavona
added a commit
to josephsavona/react
that referenced
this pull request
Feb 2, 2026
The previous PR (facebook#35606) handled maybe-throw terminals within value blocks, and the changes there also made BuildReactiveFunction able to handle sequential optionals. However, CollectOptionalChainDependencies doesn't yet handle sequential value blocks, like `foo(a?.b, b?.c) ?? {}`. This PR fixes the remaining case, which means we should no longer have arbitrary limitations around value blocks.
This was referenced Feb 4, 2026
Closed
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Adds support for value terminals (optional/logical/ternary/sequence) within try/catch clauses.
Try/catch expressions insert maybe-throw terminals after each instruction, but BuildReactiveFunction's value block extraction was not expecting these terminals. The fix is to roughly treat maybe-throw similarly to goto, falling through to the continuation block, but there are a few edge cases to handle.
I've also added extensive tests, including testing that errors correctly flow to the catch handler.