Skip to content

Commit

Permalink
Unrolled build for rust-lang#115815
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#115815 - bvanjoi:fix-115809, r=oli-obk

fix: return early when has tainted in mir pass

Fixes rust-lang#115809

As in rust-lang#115643, `run_pass` is skipped if the body has tainted errors.

r? `@oli-obk`
  • Loading branch information
rust-timer authored Sep 13, 2023
2 parents 5adddad + 7c53e87 commit 4ecf3f6
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 0 deletions.
5 changes: 5 additions & 0 deletions compiler/rustc_mir_transform/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -606,6 +606,11 @@ fn inner_optimized_mir(tcx: TyCtxt<'_>, did: LocalDefId) -> Body<'_> {
let body = tcx.mir_drops_elaborated_and_const_checked(did).steal();
let mut body = remap_mir_for_const_eval_select(tcx, body, hir::Constness::NotConst);
debug!("body: {:#?}", body);

if body.tainted_by_errors.is_some() {
return body;
}

run_optimization_passes(tcx, &mut body);

body
Expand Down
13 changes: 13 additions & 0 deletions tests/ui/unsized/issue-115809.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// compile-flags: --emit=link -Zmir-opt-level=2 -Zpolymorphize=on

fn foo<T>() {
let a: [i32; 0] = [];
match [a[..]] {
//~^ ERROR cannot move a value of type `[i32]
//~| ERROR cannot move out of type `[i32]`, a non-copy slice
[[x]] => {}
_ => (),
}
}

fn main() {}
19 changes: 19 additions & 0 deletions tests/ui/unsized/issue-115809.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
error[E0161]: cannot move a value of type `[i32]`
--> $DIR/issue-115809.rs:5:12
|
LL | match [a[..]] {
| ^^^^^ the size of `[i32]` cannot be statically determined

error[E0508]: cannot move out of type `[i32]`, a non-copy slice
--> $DIR/issue-115809.rs:5:12
|
LL | match [a[..]] {
| ^^^^^
| |
| cannot move out of here
| move occurs because value has type `[i32]`, which does not implement the `Copy` trait

error: aborting due to 2 previous errors

Some errors have detailed explanations: E0161, E0508.
For more information about an error, try `rustc --explain E0161`.

0 comments on commit 4ecf3f6

Please sign in to comment.