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

fuzzbug fix in range-summary iter

Browse Source
This commit is contained in:
Chris Fallin
2021-05-09 01:48:16 -07:00
parent 509c5dc2fd
commit 9fdc69edde
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ion/mod.rs
View File

@@ -294,6 +294,9 @@ impl<'a> std::iter::Iterator for RangeSummaryIter<'a> {
while self.idx < self.limit && self.arr[self.idx].to <= self.bound.from { while self.idx < self.limit && self.arr[self.idx].to <= self.bound.from {
self.idx += 1; self.idx += 1;
} }
if self.idx == self.limit {
return None;
}
let mut cur = self.arr[self.idx]; let mut cur = self.arr[self.idx];
if cur.from >= self.bound.to { if cur.from >= self.bound.to {
self.idx = self.limit; self.idx = self.limit;
@@ -3216,6 +3219,7 @@ impl<'a, F: Function> Env<'a, F> {
} }
fn try_allocating_regs_for_spilled_bundles(&mut self) { fn try_allocating_regs_for_spilled_bundles(&mut self) {
log::debug!("allocating regs for spilled bundles");
for i in 0..self.spilled_bundles.len() { for i in 0..self.spilled_bundles.len() {
let bundle = self.spilled_bundles[i]; // don't borrow self let bundle = self.spilled_bundles[i]; // don't borrow self
let any_vreg = self.vreg_regs[self.ranges let any_vreg = self.vreg_regs[self.ranges
@@ -3232,6 +3236,7 @@ impl<'a, F: Function> Env<'a, F> {
PReg::invalid(), PReg::invalid(),
bundle.index(), bundle.index(),
) { ) {
log::debug!("trying bundle {:?} to preg {:?}", bundle, preg);
let preg_idx = PRegIndex::new(preg.index()); let preg_idx = PRegIndex::new(preg.index());
if let AllocRegResult::Allocated(_) = if let AllocRegResult::Allocated(_) =
self.try_to_allocate_bundle_to_reg(bundle, preg_idx) self.try_to_allocate_bundle_to_reg(bundle, preg_idx)