OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rollup merge of #69437 - RalfJung:miri-no-codegen, r=ecstatic-morse

Browse Source 
no more codegen for miri_start_panic

With https://github.com/rust-lang/miri/pull/1136 landed, we don't generate code any more for crates that will be run by Miri. So the LLVM backend does not have to implement the `miri_start_panic` intrinsic any more.

Cc @Aaron1011
This commit is contained in:
Dylan DPC 2020-02-24 20:10:19 +01:00 committed by GitHub
commit e238eb610f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/librustc_codegen_ssa/mir/block.rs
View File

@ -515,12 +515,9 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
return;
}
// For normal codegen, this Miri-specific intrinsic is just a NOP.
// For normal codegen, this Miri-specific intrinsic should never occur.
if intrinsic == Some("miri_start_panic") {
let target = destination.as_ref().unwrap().1;
helper.maybe_sideeffect(self.mir, &mut bx, &[target]);
helper.funclet_br(self, &mut bx, target);
return;
bug!("`miri_start_panic` should never end up in compiled code");
}
// Emit a panic or a no-op for `panic_if_uninhabited`.