T0b1/regalloc2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BTreeMap probe fix (fuzzbug): BTree does not interact nicely with LiveRangeKey definition of equality; need to probe with one-less-than start to get proper range

Browse Source
This commit is contained in:
Chris Fallin
2021-06-01 23:10:34 -07:00
parent a2a770ec50
commit 2fe276ca04
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ion/mod.rs
View File

@@ -2472,7 +2472,10 @@ impl<'a, F: Function> Env<'a, F> {
// any preg range that *overlaps* with range `range`, not // any preg range that *overlaps* with range `range`, not
// literally the range `range`. // literally the range `range`.
let bundle_ranges = &self.bundles[bundle.index()].ranges; let bundle_ranges = &self.bundles[bundle.index()].ranges;
let from_key = LiveRangeKey::from_range(&bundle_ranges.first().unwrap().range); let from_key = LiveRangeKey::from_range(&CodeRange {
from: bundle_ranges.first().unwrap().range.from,
to: bundle_ranges.first().unwrap().range.from,
});
let mut preg_range_iter = self.pregs[reg.index()] let mut preg_range_iter = self.pregs[reg.index()]
.allocations .allocations
.btree .btree
@@ -3122,6 +3125,7 @@ impl<'a, F: Function> Env<'a, F> {
); );
let our_spill_weight = self.bundle_spill_weight(bundle); let our_spill_weight = self.bundle_spill_weight(bundle);
log::debug!(" -> our spill weight: {}", our_spill_weight);
// We detect the "too-many-live-registers" case here and // We detect the "too-many-live-registers" case here and
// return an error cleanly, rather than panicking, because // return an error cleanly, rather than panicking, because