bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #78830 - lcnr:mir-folder, r=oli-obk

Browse source 
fix `super_visit_with` for `Terminator`

fixes https://github.com/rust-lang/rust/pull/78182#discussion_r509265149

r? `@oli-obk`

cc `@LeSeulArtichaut`
This commit is contained in:
Dylan DPC 2020-11-09 19:06:59 +01:00 • committed by GitHub
commit 7924ecc341
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

31
compiler/rustc_middle/src/mir/type_foldable.rs
View file

@ -109,24 +109,21 @@ impl<'tcx> TypeFoldable<'tcx> for Terminator<'tcx> {
args.visit_with(visitor) args.visit_with(visitor)
} }
Assert { ref cond, ref msg, .. } => { Assert { ref cond, ref msg, .. } => {
if cond.visit_with(visitor).is_break() { cond.visit_with(visitor)?;
use AssertKind::*; use AssertKind::*;
match msg { match msg {
BoundsCheck { ref len, ref index } => { BoundsCheck { ref len, ref index } => {
len.visit_with(visitor)?; len.visit_with(visitor)?;
index.visit_with(visitor) index.visit_with(visitor)
}
Overflow(_, l, r) => {
l.visit_with(visitor)?;
r.visit_with(visitor)
}
OverflowNeg(op) | DivisionByZero(op) | RemainderByZero(op) => {
op.visit_with(visitor)
}
ResumedAfterReturn(_) | ResumedAfterPanic(_) => ControlFlow::CONTINUE,
} }
} else { Overflow(_, l, r) => {
ControlFlow::CONTINUE l.visit_with(visitor)?;
r.visit_with(visitor)
}
OverflowNeg(op) | DivisionByZero(op) | RemainderByZero(op) => {
op.visit_with(visitor)
}
ResumedAfterReturn(_) | ResumedAfterPanic(_) => ControlFlow::CONTINUE,
} }
} }
InlineAsm { ref operands, .. } => operands.visit_with(visitor), InlineAsm { ref operands, .. } => operands.visit_with(visitor),