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

Address review comments.

Browse Source
This commit is contained in:
Chris Fallin
2021-08-31 17:56:06 -07:00
parent 6389071e09
commit 6f0893d69d
3 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ion/merge.rs
View File

@@ -41,8 +41,8 @@ impl<'a, F: Function> Env<'a, F> {
}
// If either bundle is already assigned (due to a pinned vreg), don't merge.
if !self.bundles[from.index()].allocation.is_none()
|| !self.bundles[to.index()].allocation.is_none()
if self.bundles[from.index()].allocation.is_some()
|| self.bundles[to.index()].allocation.is_some()
{
log::trace!("one of the bundles is already assigned (pinned)");
return false;

4
src/ion/moves.rs
View File

@@ -817,8 +817,8 @@ impl<'a, F: Function> Env<'a, F> {
to_alloc,
to_vreg.index(),
);
assert!(!from_alloc.is_none());
assert!(!to_alloc.is_none());
assert!(from_alloc.is_some());
assert!(to_alloc.is_some());
assert_eq!(from_inst, to_inst.prev());
// N.B.: these moves happen with the *same* priority as
// LR-to-LR moves, because they work just like them: they