nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 06:44:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Interning even happens when validation of a constant fails

Browse Source
This commit is contained in:
Oliver Scherer 2019-12-14 12:15:37 +01:00
parent a0bd1a695d
commit 0e969b73f6
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/librustc_mir/interpret/intern.rs
View File

@ -191,12 +191,18 @@ impl<'rt, 'mir, 'tcx, M: CompileTimeMachine<'mir, 'tcx>> ValueVisitor<'mir, 'tcx
if let ty::Dynamic(..) =
self.ecx.tcx.struct_tail_erasing_lifetimes(referenced_ty, self.ecx.param_env).kind
{
// Validation has already errored on an invalid vtable pointer so this `assert_ptr`
// will never panic.
let vtable = mplace.meta.unwrap().assert_ptr();
// explitly choose `Immutable` here, since vtables are immutable, even
// if the reference of the fat pointer is mutable
self.intern_shallow(vtable.alloc_id, Mutability::Not, None)?;
// Validation has already errored on an invalid vtable pointer so we can safely not
// do anything if this is not a real pointer
if let Scalar::Ptr(vtable) = mplace.meta.unwrap() {
// explitly choose `Immutable` here, since vtables are immutable, even
// if the reference of the fat pointer is mutable
self.intern_shallow(vtable.alloc_id, Mutability::Not, None)?;
} else {
self.ecx().tcx.sess.delay_span_bug(
syntax_pos::DUMMY_SP,
"vtables pointers cannot be integer pointers",
);
}
}
// Check if we have encountered this pointer+layout combination before.
// Only recurse for allocation-backed pointers.