hot fix for rcanary due to place changed

Artisan-Lab · Dec 17, 2024 · fb6ca20 · fb6ca20
1 parent fa8854f
commit fb6ca20
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/rap/src/analysis/rcanary/ranalyzer/intra_visitor.rs b/rap/src/analysis/rcanary/ranalyzer/intra_visitor.rs
@@ -433,6 +433,30 @@ impl<'tcx, 'ctx, 'a> IntraFlowAnalysis<'tcx, 'ctx, 'a> {
                     }
                 }
             }
+            Rvalue::RawPtr(_, ref rplace) => {
+                let kind = AsgnKind::Reference;
+                let rvalue_has_projection = has_projection(rplace);
+                match (lvalue_has_projection, rvalue_has_projection) {
+                    (true, true) => {
+                        self.handle_copy_field_to_field(
+                            ctx, goal, solver, kind, lplace, rplace, disc, bidx, sidx,
+                        );
+                    }
+                    (true, false) => {
+                        self.handle_copy_to_field(
+                            ctx, goal, solver, kind, lplace, rplace, disc, bidx, sidx,
+                        );
+                    }
+                    (false, true) => {
+                        self.handle_copy_from_field(
+                            ctx, goal, solver, kind, lplace, rplace, bidx, sidx,
+                        );
+                    }
+                    (false, false) => {
+                        self.handle_copy(ctx, goal, solver, kind, lplace, rplace, bidx, sidx);
+                    }
+                }
+            }
             Rvalue::Cast(_cast_kind, op, ..) => {
                 let kind = AsgnKind::Cast;
                 match op {

diff --git a/rap/src/analysis/safedrop/graph.rs b/rap/src/analysis/safedrop/graph.rs
@@ -254,8 +254,7 @@ impl<'tcx> SafeDropGraph<'tcx> {
                                 }
                             }
                         }
-                        Rvalue::Ref(_, _, ref p)
-                        | Rvalue::RawPtr(_, ref p)=> {
+                        Rvalue::Ref(_, _, ref p) | Rvalue::RawPtr(_, ref p) => {
                             let rv_local = p.local.as_usize();
                             if values[lv_local].may_drop && values[rv_local].may_drop {
                                 let rv = p.clone();