diff options
| author | bors <bors@rust-lang.org> | 2023-08-25 13:27:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-08-25 13:27:21 +0000 |
| commit | 25ed43ddf3e03835e5a2f2c25463ceea17a66ae5 (patch) | |
| tree | 1f37e9ef91cf6f9d2d24c7e396893fccb08fe6bd /compiler/rustc_mir_transform/src | |
| parent | 738df13e8a73d6d95ddec81b7393b2d2a64b7e93 (diff) | |
| parent | 15a68610dd06351feac543afcd0802e6e2622ac8 (diff) | |
| download | rust-25ed43ddf3e03835e5a2f2c25463ceea17a66ae5.tar.gz rust-25ed43ddf3e03835e5a2f2c25463ceea17a66ae5.zip | |
Auto merge of #115138 - cjgillot:dse-move-packed, r=compiler-errors
Do not convert copies of packed projections to moves. This code path was introduced in https://github.com/rust-lang/rust/pull/113758 After seeing https://rust-lang.zulipchat.com/#narrow/stream/136281-t-opsem/topic/Packed.20fields.20and.20in-place.20function.20argument.2Freturn.20passing, this may be UB, so should be disallowed. This should not appear in normally-built MIR, which introduces temporary copies for packed projections.
Diffstat (limited to 'compiler/rustc_mir_transform/src')
| -rw-r--r-- | compiler/rustc_mir_transform/src/dead_store_elimination.rs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/compiler/rustc_mir_transform/src/dead_store_elimination.rs b/compiler/rustc_mir_transform/src/dead_store_elimination.rs index 3f988930b5e..ef14105041b 100644 --- a/compiler/rustc_mir_transform/src/dead_store_elimination.rs +++ b/compiler/rustc_mir_transform/src/dead_store_elimination.rs @@ -12,6 +12,7 @@ //! will still not cause any further changes. //! +use crate::util::is_within_packed; use rustc_index::bit_set::BitSet; use rustc_middle::mir::visit::Visitor; use rustc_middle::mir::*; @@ -49,6 +50,11 @@ pub fn eliminate<'tcx>(tcx: TyCtxt<'tcx>, body: &mut Body<'tcx>, borrowed: &BitS && !place.is_indirect() && !borrowed.contains(place.local) && !state.contains(place.local) + // If `place` is a projection of a disaligned field in a packed ADT, + // the move may be codegened as a pointer to that field. + // Using that disaligned pointer may trigger UB in the callee, + // so do nothing. + && is_within_packed(tcx, body, place).is_none() { call_operands_to_move.push((bb, index)); } |
