Skip to content

Reduce special treatment for zsts #67501

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bors merged 13 commits into from
Jan 10, 2020
Merged

Reduce special treatment for zsts #67501

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
cc0fbdf
Automatically prefer integer addresses for zst MPlace
oli-obk Dec 21, 2019
5b770b0
Remove a ZST special casing that is not necessary anymore
oli-obk Dec 21, 2019
4a5c35b
Fix an ICE happening due code assuming that `MPlaceTy` cannot have in…
oli-obk Dec 21, 2019
cac6f4c
Move `to_const_value` from `MPlaceTy` to its only use site
oli-obk Dec 26, 2019
4fbe434
Poison any `MemPlace` created from a zst Operand (or otherwise via `M…
oli-obk Dec 26, 2019
23b0c47
Ensure we don't accidentally turn non-zsts into zsts
oli-obk Dec 26, 2019
a1990db
Remove a bunch of dead functions and make some functions private
oli-obk Dec 26, 2019
f7f5952
Add warning label to `try_as_mplace`
oli-obk Dec 27, 2019
29c372b
Add more documentation
oli-obk Jan 7, 2020
d0b24e5
Actually use the poison value
oli-obk Jan 7, 2020
e632940
Update src/librustc_mir/interpret/place.rs
oli-obk Jan 9, 2020
a4fa5bb
Rename `Unsized` to `Meta`
oli-obk Jan 9, 2020
c5c4fa8
Switch assertion order to be more helpful to ppl that encounter them
oli-obk Jan 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Actually use the poison value
  • Loading branch information
@oli-obk
oli-obk committed Jan 7, 2020
commit d0b24e5ee292cc785401c880f21b690f5f3fa1d6
10 changes: 3 additions & 7 deletions src/librustc_mir/interpret/place.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,13 +180,9 @@ impl<'tcx, Tag> MPlaceTy<'tcx, Tag> {
/// Produces a MemPlace that works for ZST but nothing else
#[inline]
pub fn dangling(layout: TyLayout<'tcx>, cx: &impl HasDataLayout) -> Self {
MPlaceTy {
mplace: MemPlace::from_scalar_ptr(
Scalar::from_uint(layout.align.abi.bytes(), cx.pointer_size()),
layout.align.abi,
),
layout,
}
let align = layout.align.abi;
let ptr = Scalar::from_uint(align.bytes(), cx.pointer_size());
MPlaceTy { mplace: MemPlace { ptr, align, meta: MemPlaceMeta::Poison }, layout }
}

/// Replace ptr tag, maintain vtable tag (if any)
Expand Down