Skip to content

Miri provenance cleanup #96165

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
merged 5 commits into from
Apr 20, 2022
Merged

Miri provenance cleanup #96165

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
54ab357
ptr_get_alloc_id: don't return an actual Pointer
RalfJung Apr 18, 2022
c9e568f
avoid pairing up AllocId and PointerTag, which is redundant
RalfJung Apr 18, 2022
3236092
add method to get absolute address of a pointer (useful only for Miri)
RalfJung Apr 18, 2022
c83241a
avoid an unnecessary call to Pointer::into_parts, and caution against…
RalfJung Apr 18, 2022
55f0977
remove an unnecessary use of loc_place.ptr.into_pointer_or_addr
RalfJung Apr 18, 2022
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
remove an unnecessary use of loc_place.ptr.into_pointer_or_addr
  • Loading branch information
@RalfJung
RalfJung committed Apr 18, 2022
commit 55f0977a6baee4a3469826a45ee1308a65498129
2 changes: 1 addition & 1 deletion compiler/rustc_const_eval/src/const_eval/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ pub(crate) fn const_caller_location(
if intern_const_alloc_recursive(&mut ecx, InternKind::Constant, &loc_place).is_err() {
bug!("intern_const_alloc_recursive should not error in this case")
}
ConstValue::Scalar(Scalar::from_pointer(loc_place.ptr.into_pointer_or_addr().unwrap(), &tcx))
ConstValue::Scalar(Scalar::from_maybe_pointer(loc_place.ptr, &tcx))
}

/// Convert an evaluated constant to a type level constant
Expand Down