bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

reword Miri validity errors: undefined -> uninitialized

Browse source
This commit is contained in:
Ralf Jung 2020-04-15 12:18:20 +02:00
parent 351eefe93a
commit 9ee4d1aadc
3 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/librustc_mir/interpret/validity.rs
View file

@ -322,7 +322,11 @@ impl<'rt, 'mir, 'tcx, M: Machine<'mir, 'tcx>> ValidityVisitor<'rt, 'mir, 'tcx, M
let value = self.ecx.read_immediate(value)?; let value = self.ecx.read_immediate(value)?;
// Handle wide pointers. // Handle wide pointers.
// Check metadata early, for better diagnostics // Check metadata early, for better diagnostics
let place = try_validation!(self.ecx.ref_to_mplace(value), "undefined pointer", self.path); let place = try_validation!(
self.ecx.ref_to_mplace(value),
format_args!("uninitialized {}", kind),
self.path
);
if place.layout.is_unsized() { if place.layout.is_unsized() {
self.check_wide_ptr_meta(place.meta, place.layout)?; self.check_wide_ptr_meta(place.meta, place.layout)?;
} }
@ -334,7 +338,7 @@ impl<'rt, 'mir, 'tcx, M: Machine<'mir, 'tcx>> ValidityVisitor<'rt, 'mir, 'tcx, M
format_args!("invalid {} metadata: {}", kind, msg), format_args!("invalid {} metadata: {}", kind, msg),
self.path self.path
), ),
_ => bug!("Unexpected error during ptr size_and_align_of: {}", err), _ => bug!("unexpected error during ptr size_and_align_of: {}", err),
}, },
}; };
let (size, align) = size_and_align let (size, align) = size_and_align
@ -477,10 +481,11 @@ impl<'rt, 'mir, 'tcx, M: Machine<'mir, 'tcx>> ValidityVisitor<'rt, 'mir, 'tcx, M
} }
ty::RawPtr(..) => { ty::RawPtr(..) => {
// We are conservative with undef for integers, but try to // We are conservative with undef for integers, but try to
// actually enforce our current rules for raw pointers. // actually enforce the strict rules for raw pointers (mostly because
// that lets us re-use `ref_to_mplace`).
let place = try_validation!( let place = try_validation!(
self.ecx.ref_to_mplace(self.ecx.read_immediate(value)?), self.ecx.ref_to_mplace(self.ecx.read_immediate(value)?),
"undefined pointer", "uninitialized raw pointer",
self.path self.path
); );
if place.layout.is_unsized() { if place.layout.is_unsized() {
@ -776,14 +781,14 @@ impl<'rt, 'mir, 'tcx, M: Machine<'mir, 'tcx>> ValueVisitor<'mir, 'tcx, M>
// For some errors we might be able to provide extra information // For some errors we might be able to provide extra information
match err.kind { match err.kind {
err_ub!(InvalidUndefBytes(Some(ptr))) => { err_ub!(InvalidUndefBytes(Some(ptr))) => {
// Some byte was undefined, determine which // Some byte was uninitialized, determine which
// element that byte belongs to so we can // element that byte belongs to so we can
// provide an index. // provide an index.
let i = usize::try_from(ptr.offset.bytes() / layout.size.bytes()) let i = usize::try_from(ptr.offset.bytes() / layout.size.bytes())
.unwrap(); .unwrap();
self.path.push(PathElem::ArrayElem(i)); self.path.push(PathElem::ArrayElem(i));
throw_validation_failure!("undefined bytes", self.path) throw_validation_failure!("uninitialized value", self.path)
} }
// Other errors shouldn't be possible // Other errors shouldn't be possible
_ => return Err(err), _ => return Err(err),

4
src/test/ui/consts/const-eval/ub-wide-ptr.stderr
View file

@ -62,7 +62,7 @@ LL | |
LL | | let uninit_len = MaybeUninit::<usize> { uninit: () }; LL | | let uninit_len = MaybeUninit::<usize> { uninit: () };
LL | | mem::transmute((42, uninit_len)) LL | | mem::transmute((42, uninit_len))
LL | | }; LL | | };
| |__^ type validation failed: encountered undefined pointer | |__^ type validation failed: encountered uninitialized reference
| |
= note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior. = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
@ -130,7 +130,7 @@ LL | |
LL | | let uninit_len = MaybeUninit::<usize> { uninit: () }; LL | | let uninit_len = MaybeUninit::<usize> { uninit: () };
LL | | mem::transmute((42, uninit_len)) LL | | mem::transmute((42, uninit_len))
LL | | }; LL | | };
| |__^ type validation failed: encountered undefined pointer | |__^ type validation failed: encountered uninitialized raw pointer
| |
= note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior. = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.

2
src/test/ui/consts/const-eval/union-ice.stderr
View file

@ -27,7 +27,7 @@ LL | | unsafe { UNION.field3 },
... | ... |
LL | | a: 42, LL | | a: 42,
LL | | }; LL | | };
| |__^ type validation failed: encountered undefined bytes at .b[1] | |__^ type validation failed: encountered uninitialized value at .b[1]
| |
= note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior. = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.