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

Fuzzbug fix for requirement recomputation on minimal bundles with multiple LRs

Browse Source
This commit is contained in:
Chris Fallin
2021-05-24 17:49:45 -07:00
parent 10d926557a
commit 5120681730
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ion/mod.rs
View File

@@ -2663,7 +2663,14 @@ impl<'a, F: Function> Env<'a, F> {
log::debug!(" -> non-fixed and minimal: spill weight 1000000"); log::debug!(" -> non-fixed and minimal: spill weight 1000000");
1_000_000 1_000_000
}; };
let req = self.ranges[first_range.index()].requirement; // Even a minimal bundle may have multiple ranges (one for
// pre and one for post of one instruction). We need to
// iterate over all (up to 2) to merge requiements.
let mut req = Requirement::Unknown;
for entry in &self.bundles[bundle.index()].ranges {
req = req.merge(self.ranges[entry.index.index()].requirement);
}
log::debug!(" -> req from first range: {:?}", req);
(w, req) (w, req)
} else { } else {
let mut total = 0; let mut total = 0;
@@ -2677,6 +2684,7 @@ impl<'a, F: Function> Env<'a, F> {
total += range_data.uses_spill_weight(); total += range_data.uses_spill_weight();
req = req.merge(range_data.requirement); req = req.merge(range_data.requirement);
} }
log::debug!(" -> req from all ranges: {:?}", req);
if self.bundles[bundle.index()].prio > 0 { if self.bundles[bundle.index()].prio > 0 {
log::debug!( log::debug!(