bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Adjust computation of place types to detect more invalid places

Browse source
This commit is contained in:
Jakob Degen 2022-03-24 18:25:37 -04:00
parent dae5c842fc
commit 2f4a7a0742
2 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compiler/rustc_const_eval/src/transform/validate.rs
View file

@ -3,8 +3,8 @@
use rustc_index::bit_set::BitSet;
use rustc_infer::infer::TyCtxtInferExt;
use rustc_middle::mir::interpret::Scalar;
use rustc_middle::mir::traversal;
use rustc_middle::mir::visit::{PlaceContext, Visitor};
use rustc_middle::mir::{traversal, Place};
use rustc_middle::mir::{
AggregateKind, BasicBlock, Body, BorrowKind, Local, Location, MirPass, MirPhase, Operand,
PlaceElem, PlaceRef, ProjectionElem, Rvalue, SourceScope, Statement, StatementKind, Terminator,
@ -240,6 +240,14 @@ impl<'a, 'tcx> Visitor<'tcx> for TypeChecker<'a, 'tcx> {
self.super_projection_elem(local, proj_base, elem, context, location);
}
fn visit_place(&mut self, place: &Place<'tcx>, _: PlaceContext, location: Location) {
// Set off any `bug!`s in the type computation code
let ty = place.ty(&self.body.local_decls, self.tcx);
if ty.variant_index.is_some() {
self.fail(location, "Top level places may not have their variant index set!");
}
}
fn visit_statement(&mut self, statement: &Statement<'tcx>, location: Location) {
match &statement.kind {
StatementKind::Assign(box (dest, rvalue)) => {