bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Unconditionally lower match arm even if it's unneeded for never pattern in match

Browse source
This commit is contained in:
Mu001999 2025-02-28 00:57:54 +08:00
parent a18bd8acfc
commit d504f70ec9
3 changed files with 53 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/rustc_ast_lowering/src/expr.rs
View file

@ -672,10 +672,13 @@ impl<'hir> LoweringContext<'_, 'hir> {
let span = self.lower_span(arm.span);
self.lower_attrs(hir_id, &arm.attrs);
let is_never_pattern = pat.is_never_pattern();
let body = if let Some(body) = &arm.body
// We need to lower the body even if it's unneeded for never pattern in match,
// ensure that we can get HirId for DefId if need (issue #137708).
let body = arm.body.as_ref().map(|x| self.lower_expr(x));
let body = if let Some(body) = body
&& !is_never_pattern
{
self.lower_expr(body)
body
} else {
// Either `body.is_none()` or `is_never_pattern` here.
if !is_never_pattern {