fix for merging ret alias

Author: VaynNecol

rapx/src/analysis/core/alias/mop/alias.rs

@@ -281,8 +281,12 @@ impl<'tcx> MopGraph<'tcx> {
                         && idx != node.index
                         && node.local != results_nodes[idx].local
                     {
-                        let left_node = node;
-                        let right_node = &results_nodes[idx];
+                        let left_node;
+                        let right_node;
+                        match results_nodes[idx].local {
+                            0 => { left_node = &results_nodes[idx]; right_node = node; },
+                            _ => { left_node = node; right_node = &results_nodes[idx]; }
+                        }
                         let mut new_alias = RetAlias::new(
                             left_node.local,
                             left_node.may_drop,

rapx/src/analysis/safedrop/alias.rs

@@ -192,8 +192,8 @@ impl<'tcx> SafeDropGraph<'tcx> {
         // } else {
         //     self.values[lv].alias = self.values[rv].alias.clone();
         // }
+        if lv > self.values.len() || rv > self.values.len() { return; }
         self.union_merge(lv, rv);
-
         for field in self.values[rv].fields.clone().into_iter() {
             if !self.values[lv].fields.contains_key(&field.0) {
                 let mut node = ValueNode::new(