fixups

Author: cfallin

src/fastalloc/mod.rs

@@ -453,6 +453,10 @@ impl<'a, F: Function> Env<'a, F> {
             OperandConstraint::Reuse(_) => {
                 unreachable!()
             }
+
+            OperandConstraint::Stack => {
+                panic!("Stack constraints not supported in fastalloc");
+            }
         }
     }
 
@@ -576,6 +580,10 @@ impl<'a, F: Function> Env<'a, F> {
                 // This is handled elsewhere.
                 unreachable!();
             }
+
+            OperandConstraint::Stack => {
+                panic!("Stack operand constraints not supported in fastalloc");
+            }
         };
         self.allocs[(inst.index(), op_idx)] = new_alloc;
         Ok(new_alloc)

src/ion/data_structures.rs

@@ -265,7 +265,7 @@ impl LiveBundle {
 
     #[inline(always)]
     pub fn cached_spill_weight(&self) -> u32 {
-        self.spill_weight_and_props & ((1 << 28) - 1)
+        self.spill_weight_and_props & BUNDLE_MAX_SPILL_WEIGHT
     }
 }
 

src/ion/process.rs

@@ -1046,7 +1046,8 @@ impl<'a, F: Function> Env<'a, F> {
                 Requirement::Stack => {
                     // If we must be on the stack, mark our spillset
                     // as required immediately.
-                    self.spillsets[self.bundles[bundle].spillset].required = true;
+                    let spillset = self.bundles[bundle].spillset;
+                    self.spillsets[spillset].required = true;
                     return Ok(());
                 }