analyze: fix panic on addr_of!(...) as ... (#945)

Fixes the panic described in #839 (comment)
immunant · Jun 5, 2023 · f082f17 · f082f17
2 parents db19cef + 6d93064
commit f082f17
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/c2rust-analyze/src/rewrite/expr/mir_op.rs b/c2rust-analyze/src/rewrite/expr/mir_op.rs
@@ -312,7 +312,9 @@ impl<'a, 'tcx> ExprRewriteVisitor<'a, 'tcx> {
             Rvalue::AddressOf(mutbl, pl) => {
                 self.enter_rvalue_place(0, |v| v.visit_place(pl));
                 if let Some(expect_ty) = expect_ty {
-                    let desc = type_desc::perms_to_desc(
+                    let desc = type_desc::perms_to_desc_with_pointee(
+                        self.acx.tcx(),
+                        self.acx.type_of(pl).ty,
                         expect_ty.ty,
                         self.perms[expect_ty.label],
                         self.flags[expect_ty.label],

diff --git a/c2rust-analyze/tests/filecheck/addr_of.rs b/c2rust-analyze/tests/filecheck/addr_of.rs
@@ -24,3 +24,10 @@ fn shared_ref_with_struct() {
     // CHECK-DAG: let y = &(x.a);
     let y = std::ptr::addr_of!(x.a);
 }
+
+// CHECK-LABEL: fn cast_array_to_ptr_explicit(s: &[u8; 0]) {
+pub fn cast_array_to_ptr_explicit(s: &[u8; 0]) {
+    // For now, this doesn't get rewritten - we're just checking that the analysis doesn't panic.
+    // CHECK-DAG: std::ptr::addr_of!(*s) as *const u8
+    std::ptr::addr_of!(*s) as *const u8;
+}