nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-04-08 10:07:27 +00:00
Code Issues Packages Projects Releases Wiki 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
compiler/rustc_middle/src/mir/type_foldable.rs
View File

@ -109,7 +109,7 @@ impl<'tcx> TypeFoldable<'tcx> for Terminator<'tcx> {
args.visit_with(visitor)
}
Assert { ref cond, ref msg, .. } => {
if cond.visit_with(visitor).is_break() {
cond.visit_with(visitor)?;
use AssertKind::*;
match msg {
BoundsCheck { ref len, ref index } => {
@ -125,9 +125,6 @@ impl<'tcx> TypeFoldable<'tcx> for Terminator<'tcx> {
}
ResumedAfterReturn(_) | ResumedAfterPanic(_) => ControlFlow::CONTINUE,
}
} else {
ControlFlow::CONTINUE
}
}
InlineAsm { ref operands, .. } => operands.visit_with(visitor),
Goto { .. }