analyze: misc fixes for rustc update

Author: spernsteiner

c2rust-analyze/src/borrowck/def_use.rs

@@ -81,6 +81,10 @@ pub fn categorize(context: PlaceContext) -> Option<DefUse> {
 
         // Debug info is neither def nor use.
         PlaceContext::NonUse(NonUseContext::VarDebugInfo) => None,
+
+        PlaceContext::MutatingUse(MutatingUseContext::Deinit | MutatingUseContext::SetDiscriminant) => {
+            panic!("These statements are not allowed in this MIR phase")
+        }
     }
 }
 

c2rust-analyze/src/context.rs

@@ -342,6 +342,7 @@ impl<'tcx> TypeOf<'tcx> for Rvalue<'tcx> {
 
         match *self {
             Rvalue::Use(ref op) => acx.type_of(op),
+            Rvalue::CopyForDeref(pl) => acx.type_of(pl),
             Rvalue::Repeat(ref op, _) => {
                 let op_lty = acx.type_of(op);
                 let ty = self.ty(acx, acx.tcx());

c2rust-analyze/src/expr_rewrite.rs

@@ -3,7 +3,7 @@ use crate::pointer_id::PointerTable;
 use crate::type_desc::{self, Ownership, Quantity};
 use crate::util::{self, Callee};
 use rustc_middle::mir::{
-    BasicBlock, Body, Location, Operand, Rvalue, Statement, StatementKind, Terminator,
+    BasicBlock, Body, Location, Operand, Place, Rvalue, Statement, StatementKind, Terminator,
     TerminatorKind,
 };
 use rustc_span::{Span, DUMMY_SP};
@@ -132,6 +132,7 @@ impl<'a, 'tcx> ExprRewriteVisitor<'a, 'tcx> {
             }
             StatementKind::FakeRead(..) => {}
             StatementKind::SetDiscriminant { .. } => todo!("statement {:?}", stmt),
+            StatementKind::Deinit(..) => {}
             StatementKind::StorageLive(..) => {}
             StatementKind::StorageDead(..) => {}
             StatementKind::Retag(..) => {}
@@ -251,23 +252,29 @@ impl<'a, 'tcx> ExprRewriteVisitor<'a, 'tcx> {
             Rvalue::ShallowInitBox(ref _op, _ty) => {
                 // TODO
             }
+            Rvalue::CopyForDeref(pl) => {
+                self.enter_rvalue_operand(0, |v| v.visit_place(pl, expect_ty));
+            }
         }
     }
 
     fn visit_operand(&mut self, op: &Operand<'tcx>, expect_ty: LTy<'tcx>) {
         match *op {
             Operand::Copy(pl) | Operand::Move(pl) => {
-                if let Some(ptr) = self.acx.ptr_of(pl) {
-                    let expect_ptr = expect_ty.label;
-                    self.emit_ptr_cast(ptr, expect_ptr);
-                }
-
-                // TODO: walk over `pl` to handle all derefs (casts, `*x` -> `(*x).get()`)
+                self.visit_place(pl, expect_ty);
             }
             Operand::Constant(..) => {}
         }
     }
 
+    fn visit_place(&mut self, pl: Place<'tcx>, expect_ty: LTy<'tcx>) {
+        if let Some(ptr) = self.acx.ptr_of(pl) {
+            let expect_ptr = expect_ty.label;
+            self.emit_ptr_cast(ptr, expect_ptr);
+        }
+        // TODO: walk over `pl` to handle all derefs (casts, `*x` -> `(*x).get()`)
+    }
+
     fn visit_operand_desc(
         &mut self,
         op: &Operand<'tcx>,