mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #111917 - WaffleLapkin:validate_unalloc, r=oli-obk

Browse Source 
Simplify duplicate checks for mir validator

This removes unnecessary allocations & is less code.
This commit is contained in:
Michael Goulet 2023-07-06 20:11:38 -07:00 committed by GitHub
commit 3aa4561923
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
compiler/rustc_const_eval/src/transform/validate.rs
View File

@ -67,8 +67,8 @@ impl<'tcx> MirPass<'tcx> for Validator {
unwind_edge_count: 0, unwind_edge_count: 0,
reachable_blocks: traversal::reachable_as_bitset(body), reachable_blocks: traversal::reachable_as_bitset(body),
storage_liveness, storage_liveness,
place_cache: Vec::new(), place_cache: FxHashSet::default(),
value_cache: Vec::new(), value_cache: FxHashSet::default(),
}; };
checker.visit_body(body); checker.visit_body(body);
checker.check_cleanup_control_flow(); checker.check_cleanup_control_flow();
@ -95,8 +95,8 @@ struct TypeChecker<'a, 'tcx> {
unwind_edge_count: usize, unwind_edge_count: usize,
reachable_blocks: BitSet<BasicBlock>, reachable_blocks: BitSet<BasicBlock>,
storage_liveness: ResultsCursor<'a, 'tcx, MaybeStorageLive<'static>>, storage_liveness: ResultsCursor<'a, 'tcx, MaybeStorageLive<'static>>,
place_cache: Vec<PlaceRef<'tcx>>, place_cache: FxHashSet<PlaceRef<'tcx>>,
value_cache: Vec<u128>, value_cache: FxHashSet<u128>,
} }
impl<'a, 'tcx> TypeChecker<'a, 'tcx> { impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
@ -951,10 +951,7 @@ impl<'a, 'tcx> Visitor<'tcx> for TypeChecker<'a, 'tcx> {
self.value_cache.clear(); self.value_cache.clear();
self.value_cache.extend(targets.iter().map(|(value, _)| value)); self.value_cache.extend(targets.iter().map(|(value, _)| value));
let all_len = self.value_cache.len(); let has_duplicates = targets.iter().len() != self.value_cache.len();
self.value_cache.sort_unstable();
self.value_cache.dedup();
let has_duplicates = all_len != self.value_cache.len();
if has_duplicates { if has_duplicates {
self.fail( self.fail(
location, location,
@ -987,16 +984,14 @@ impl<'a, 'tcx> Visitor<'tcx> for TypeChecker<'a, 'tcx> {
// passed by a reference to the callee. Consequently they must be non-overlapping. // passed by a reference to the callee. Consequently they must be non-overlapping.
// Currently this simply checks for duplicate places. // Currently this simply checks for duplicate places.
self.place_cache.clear(); self.place_cache.clear();
self.place_cache.push(destination.as_ref()); self.place_cache.insert(destination.as_ref());
let mut has_duplicates = false;
for arg in args { for arg in args {
if let Operand::Move(place) = arg { if let Operand::Move(place) = arg {
self.place_cache.push(place.as_ref()); has_duplicates |= !self.place_cache.insert(place.as_ref());
} }
} }
let all_len = self.place_cache.len();
let mut dedup = FxHashSet::default();
self.place_cache.retain(|p| dedup.insert(*p));
let has_duplicates = all_len != self.place_cache.len();
if has_duplicates { if has_duplicates {
self.fail( self.fail(
location, location,