Fix mismatched usize/u64 array element type (#494)

Closes #320

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -5019,9 +5019,9 @@ std::string Converter::ConvertPlaceholder(clang::Expr *expr, clang::Expr *arg,
   }
 
   if (ph_ctx.declared_in_rule_as_rust_ptr && arg->getType()->isArrayType()) {
-    return std::format(
-        "({} as {})", ConvertFreshPointer(arg),
-        Mapper::GetParamType(ctx_, GetCalleeOrExpr(expr), ph_ctx.arg_idx));
+    auto elem = ctx_.getAsArrayType(arg->getType())->getElementType();
+    return std::format("({} as {})", ConvertFreshPointer(arg),
+                       ToStringBase(ctx_.getPointerType(elem)));
   }
 
   if (ph_ctx.needs_materialization()) {

tests/unit/out/refcount/size_t_ssize_t.rs

@@ -202,6 +202,12 @@ fn main_0() -> i32 {
         Rc::new(RefCell::new(1.try_into().expect("failed conversion"))),
     )));
     assert!(((*(*pr.borrow()).0.borrow()) == 21_u64));
+    let sizes: Value<Box<[usize]>> =
+        Rc::new(RefCell::new(Box::new([1_usize, 2_usize, 3_usize, 4_usize])));
+    let mut sizes_end: Ptr<usize> =
+        ((sizes.as_pointer() as Ptr<usize>).to_end()).reinterpret_cast::<usize>();
+    assert!((((sizes_end).clone() - (sizes.as_pointer() as Ptr::<usize>)) as i64 == 4_i64));
+    assert!((((sizes_end.offset(-((1) as isize))).read()) == 4_usize));
     return 0;
 }
 pub fn __cpp2rust_init_globals() {}

tests/unit/out/unsafe/size_t_ssize_t.rs

@@ -188,6 +188,15 @@ unsafe fn main_0() -> i32 {
     assert!(((mins[(2) as usize]) == (2_usize)));
     let mut pr: (u64, i32) = ((sz as u64).into(), 1.into());
     assert!(((pr.0) == (21_u64)));
+    let sizes: [usize; 4] = [1_usize, 2_usize, 3_usize, 4_usize];
+    let mut sizes_end: *const usize =
+        (sizes.as_ptr().add(sizes.len()) as *const u64).cast::<usize>();
+    assert!(
+        ((((sizes_end as usize - sizes.as_ptr() as usize) / ::std::mem::size_of::<usize>())
+            as i64)
+            == (4_i64))
+    );
+    assert!(((*(sizes_end.offset(-((1) as isize)))) == (4_usize)));
     return 0;
 }
 pub unsafe fn __cpp2rust_init_globals() {}

tests/unit/size_t_ssize_t.cpp

@@ -2,6 +2,7 @@
 #include <cassert>
 #include <cstddef>
 #include <cstdint>
+#include <iterator>
 #include <sys/types.h>
 #include <utility>
 
@@ -107,5 +108,10 @@ int main() {
 
   std::pair<std::size_t, int> pr(sz, 1);
   assert(pr.first == 21);
+
+  const size_t sizes[] = {1, 2, 3, 4};
+  const size_t *sizes_end = std::end(sizes);
+  assert(sizes_end - sizes == 4);
+  assert(*(sizes_end - 1) == 4);
   return 0;
 }