mirror of https://github.com/rust-lang/rust.git
Rollup merge of #121391 - Nadrieril:fix-liveness, r=compiler-errors
never patterns: Fix liveness analysis in the presence of never patterns There's a bunch of code that only looks at the first alternative of an or-pattern, under the assumption that all alternatives have the same set of bindings. This is true except for never pattern alternatives (e.g. `Ok(x) | Err(!)`), so we skip these. I expect there's other code with this problem, I'll have to check that later. I don't have tests for this yet because mir lowering causes other issues; I'll have some in the next PR. r? ``@compiler-errors``
This commit is contained in:
commit
60cb794181
|
@ -71,14 +71,21 @@ impl hir::Pat<'_> {
|
|||
/// Call `f` on every "binding" in a pattern, e.g., on `a` in
|
||||
/// `match foo() { Some(a) => (), None => () }`.
|
||||
///
|
||||
/// When encountering an or-pattern `p_0 | ... | p_n` only `p_0` will be visited.
|
||||
/// When encountering an or-pattern `p_0 | ... | p_n` only the first non-never pattern will be
|
||||
/// visited. If they're all never patterns we visit nothing, which is ok since a never pattern
|
||||
/// cannot have bindings.
|
||||
pub fn each_binding_or_first(
|
||||
&self,
|
||||
f: &mut impl FnMut(hir::BindingAnnotation, HirId, Span, Ident),
|
||||
) {
|
||||
self.walk(|p| match &p.kind {
|
||||
PatKind::Or(ps) => {
|
||||
ps[0].each_binding_or_first(f);
|
||||
for p in *ps {
|
||||
if !p.is_never_pattern() {
|
||||
p.each_binding_or_first(f);
|
||||
break;
|
||||
}
|
||||
}
|
||||
false
|
||||
}
|
||||
PatKind::Binding(bm, _, ident, _) => {
|
||||
|
|
|
@ -526,8 +526,8 @@ impl<'a, 'tcx> Liveness<'a, 'tcx> {
|
|||
}
|
||||
|
||||
fn define_bindings_in_pat(&mut self, pat: &hir::Pat<'_>, mut succ: LiveNode) -> LiveNode {
|
||||
// In an or-pattern, only consider the first pattern; any later patterns
|
||||
// must have the same bindings, and we also consider the first pattern
|
||||
// In an or-pattern, only consider the first non-never pattern; any later patterns
|
||||
// must have the same bindings, and we also consider that pattern
|
||||
// to be the "authoritative" set of ids.
|
||||
pat.each_binding_or_first(&mut |_, hir_id, pat_sp, ident| {
|
||||
let ln = self.live_node(hir_id, pat_sp);
|
||||
|
|
Loading…
Reference in New Issue