Skip to content

Simplifications in match lowering #126835

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 8 commits into from
Jun 29, 2024
Merged

Simplifications in match lowering #126835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ea29d6a
We can traverse bindings before `lower_match_tree` now
Nadrieril Jun 17, 2024
012626b
Only one caller of `lower_match_tree` was using the fake borrows
Nadrieril Jun 17, 2024
cef49f7
Small dedup
Nadrieril Jun 17, 2024
878ccd2
There's nothing to bind for a wildcard
Nadrieril Jun 17, 2024
c0c6c32
Move `lower_match_tree`
Nadrieril Jun 17, 2024
7b150a1
Don't use fake wildcards when we can get the failure block directly
Nadrieril Jun 17, 2024
ff49c37
Reuse `lower_let_expr` for `let .. else` lowering
Nadrieril Jun 17, 2024
beb1d35
Change comment to reflect switch to THIR unsafeck
Nadrieril Jun 22, 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
63 changes: 31 additions & 32 deletions compiler/rustc_mir_build/src/build/block.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,38 +189,37 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {

let initializer_span = this.thir[*initializer].span;
let scope = (*init_scope, source_info);
let failure = unpack!(
block = this.in_scope(scope, *lint_level, |this| {
this.declare_bindings(
visibility_scope,
remainder_span,
pattern,
None,
Some((Some(&destination), initializer_span)),
);
this.visit_primary_bindings(
pattern,
UserTypeProjections::none(),
&mut |this, _, _, node, span, _, _| {
this.storage_live_binding(
block,
node,
span,
OutsideGuard,
true,
);
},
);
this.ast_let_else(
block,
*initializer,
initializer_span,
*else_block,
&last_remainder_scope,
pattern,
)
})
);
let failure_and_block = this.in_scope(scope, *lint_level, |this| {
this.declare_bindings(
visibility_scope,
remainder_span,
pattern,
None,
Some((Some(&destination), initializer_span)),
);
this.visit_primary_bindings(
pattern,
UserTypeProjections::none(),
&mut |this, _, _, node, span, _, _| {
this.storage_live_binding(block, node, span, OutsideGuard, true);
},
);
let else_block_span = this.thir[*else_block].span;
let (matching, failure) =
this.in_if_then_scope(last_remainder_scope, else_block_span, |this| {
this.lower_let_expr(
block,
*initializer,
pattern,
None,
initializer_span,
false,
true,
Comment on lines +216 to +217
Copy link
Contributor

@Zalathar Zalathar Jun 26, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This sort of thing makes me want to start adding dedicated enums to replace some of these magic booleans.

For example, I want to replace declare_let_bindings: bool with a three-way enum:

enum DeclareLetBindings {
    Yes,
    No,
    LetNotPermitted,
}

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've opened a draft PR to replace some booleans with enums: #126981.

)
});
matching.and(failure)
});
let failure = unpack!(block = failure_and_block);
this.cfg.goto(failure, source_info, failure_entry);

if let Some(source_scope) = visibility_scope {
Expand Down
Loading