Merge pull request #87 from AverardoDiMugello/issue-84-fixes

Issue 84 fixes
rems-project · Jan 14, 2025 · caee8c7 · caee8c7
2 parents cf6b434 + 53f5f9c
commit caee8c7
Showing 1 changed file with 15 additions and 13 deletions.
diff --git a/isla-lib/src/ir/ssa.rs b/isla-lib/src/ir/ssa.rs
@@ -779,10 +779,10 @@ impl DominanceFrontiers {
             if let Some(first) = predecessors.next() {
                 if let Some(second) = predecessors.next() {
                     for p in [first, second].iter().copied().chain(predecessors) {
-                        let mut runner = p;
-                        while runner != doms.immediate_dominator(b).unwrap() {
-                            frontiers[runner.index()].insert(b);
-                            runner = doms.immediate_dominator(runner).unwrap()
+                        let mut runner = Some(p);
+                        while runner.is_some() && runner != doms.immediate_dominator(b) {
+                            frontiers[runner.unwrap().index()].insert(b);
+                            runner = doms.immediate_dominator(runner.unwrap());
                         }
                     }
                 }
@@ -946,15 +946,17 @@ impl<B: BV> CFG<B> {
         }
 
         for a in all_vars {
-            let mut worklist: Vec<NodeIndex> = defsites.get_mut(a).unwrap().drain().collect();
-
-            while let Some(n) = worklist.pop() {
-                for y in frontiers.get(n) {
-                    if !needs_phi.entry(*a).or_default().contains(y) {
-                        let num_preds = self.graph.edges_directed(*y, Direction::Incoming).count();
-                        self.graph.node_weight_mut(*y).unwrap().insert_phi(*a, num_preds);
-                        needs_phi.entry(*a).or_default().insert(*y);
-                        worklist.push(*y)
+            if let Some(defsite) = defsites.get_mut(a) {
+                let mut worklist: Vec<NodeIndex> = defsite.drain().collect();
+
+                while let Some(n) = worklist.pop() {
+                    for y in frontiers.get(n) {
+                        if !needs_phi.entry(*a).or_default().contains(y) {
+                            let num_preds = self.graph.edges_directed(*y, Direction::Incoming).count();
+                            self.graph.node_weight_mut(*y).unwrap().insert_phi(*a, num_preds);
+                            needs_phi.entry(*a).or_default().insert(*y);
+                            worklist.push(*y)
+                        }
                     }
                 }
             }