OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #30135 - michaelwoerister:interning-checks, r=sanxiyn

Browse Source 
This PR adds some safety checks to interning things in `ty::ctxt`. Accidentally re-interning an `AdtDef` has bitten me in the behind just last week (it messes up things in very subtle way only showing up later as an LLVM assertion).

Initially I had also added a check to `ty::ctxt::node_type_insert()` -- but there it seems to be expected that the same table slot is written to multiple times.

Roll-up candidate.
This commit is contained in:
bors 2015-12-01 13:19:41 +00:00
commit 4dda364ab3
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/librustc/middle/ty/context.rs
View File

@ -408,7 +408,10 @@ impl<'tcx> ctxt<'tcx> {
-> &'tcx ty::TraitDef<'tcx> { -> &'tcx ty::TraitDef<'tcx> {
let did = def.trait_ref.def_id; let did = def.trait_ref.def_id;
let interned = self.arenas.trait_defs.alloc(def); let interned = self.arenas.trait_defs.alloc(def);
self.trait_defs.borrow_mut().insert(did, interned); if let Some(prev) = self.trait_defs.borrow_mut().insert(did, interned) {
self.sess.bug(&format!("Tried to overwrite interned TraitDef: {:?}",
prev))
}
interned interned
} }
@ -425,7 +428,10 @@ impl<'tcx> ctxt<'tcx> {
let def = ty::AdtDefData::new(self, did, kind, variants); let def = ty::AdtDefData::new(self, did, kind, variants);
let interned = self.arenas.adt_defs.alloc(def); let interned = self.arenas.adt_defs.alloc(def);
// this will need a transmute when reverse-variance is removed // this will need a transmute when reverse-variance is removed
self.adt_defs.borrow_mut().insert(did, interned); if let Some(prev) = self.adt_defs.borrow_mut().insert(did, interned) {
self.sess.bug(&format!("Tried to overwrite interned AdtDef: {:?}",
prev))
}
interned interned
} }
@ -435,13 +441,20 @@ impl<'tcx> ctxt<'tcx> {
} }
let interned = self.arenas.stability.alloc(stab); let interned = self.arenas.stability.alloc(stab);
self.stability_interner.borrow_mut().insert(interned, interned); if let Some(prev) = self.stability_interner
.borrow_mut()
.insert(interned, interned) {
self.sess.bug(&format!("Tried to overwrite interned Stability: {:?}",
prev))
}
interned interned
} }
pub fn store_free_region_map(&self, id: NodeId, map: FreeRegionMap) { pub fn store_free_region_map(&self, id: NodeId, map: FreeRegionMap) {
self.free_region_maps.borrow_mut() if self.free_region_maps.borrow_mut().insert(id, map).is_some() {
.insert(id, map); self.sess.bug(&format!("Tried to overwrite interned FreeRegionMap for NodeId {:?}",
id))
}
} }
pub fn free_region_map(&self, id: NodeId) -> FreeRegionMap { pub fn free_region_map(&self, id: NodeId) -> FreeRegionMap {