Skip cast when reference coerces to pointer (#368)

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -4003,10 +4003,6 @@ void Converter::ConvertVarInit(clang::QualType qual_type, clang::Expr *expr) {
     PushInitType init_type(*this, qual_type);
     Convert(expr, qual_type);
   }
-  if (qual_type->isReferenceType() && !IsReferenceType(expr)) {
-    StrCat(keyword::kAs);
-    Convert(qual_type);
-  }
 }
 
 void Converter::ConvertUnsignedArithOperand(clang::Expr *expr,

tests/ub/out/unsafe/dangling-prvalue-as-lvalue.rs

@@ -16,7 +16,7 @@ pub fn main() {
 }
 unsafe fn main_0() -> i32 {
     let mut v: Vec<i32> = vec![1, 2];
-    let b: *const i32 = (unsafe { foo_0(&(*v.as_mut_ptr()) as *const i32) });
+    let b: *const i32 = (unsafe { foo_0(&(*v.as_mut_ptr())) });
     v.clear();
     return (*b);
 }

tests/ub/out/unsafe/ub1.rs

@@ -9,7 +9,7 @@ use std::rc::Rc;
 pub unsafe fn dangling_0() -> *mut i32 {
     let mut x: i32 = 1;
     let mut p: *mut i32 = (&mut x as *mut i32);
-    return &mut (*p) as *mut i32;
+    return &mut (*p);
 }
 pub fn main() {
     unsafe {

tests/ub/out/unsafe/ub4.rs

@@ -19,7 +19,7 @@ unsafe fn main_0() -> i32 {
     let mut x1: i32 = 1;
     if (x1 != 0) {
         let mut x2: i32 = -1_i32;
-        out = (unsafe { smaller_0(&mut x1 as *mut i32, &mut x2 as *mut i32) });
+        out = (unsafe { smaller_0(&mut x1, &mut x2) });
     }
     return (*out);
 }

tests/ub/out/unsafe/ub5.rs

@@ -18,6 +18,6 @@ unsafe fn main_0() -> i32 {
     let mut x: i32 = 1;
     let mut p: *mut i32 = (&mut x as *mut i32);
     (unsafe { null_0((&mut p as *mut *mut i32)) });
-    let r: *mut i32 = &mut (*p) as *mut i32;
+    let r: *mut i32 = &mut (*p);
     return (*r);
 }

tests/ub/out/unsafe/ub6.rs

@@ -19,7 +19,7 @@ pub unsafe fn fill_1(arr: *mut Option<Box<[*mut i32]>>, n1: *mut i32) {
     let mut n2: i32 = (*n1);
     let mut pair: Pair = (unsafe {
         let _x1: *mut i32 = n1;
-        let _x2: *mut i32 = &mut n2 as *mut i32;
+        let _x2: *mut i32 = &mut n2;
         mkPair_0(_x1, _x2)
     });
     (*arr).as_mut().unwrap()[(0_usize)] = (pair.x1);
@@ -46,7 +46,6 @@ unsafe fn main_0() -> i32 {
             .map(|_| <*mut i32>::default())
             .collect::<Box<[_]>>(),
     );
-    (unsafe { fill_1(&mut arr as *mut Option<Box<[*mut i32]>>, &mut n as *mut i32) });
-    return ((unsafe { any_2(&mut arr as *mut Option<Box<[*mut i32]>>, &mut n as *mut i32) })
-        as i32);
+    (unsafe { fill_1(&mut arr, &mut n) });
+    return ((unsafe { any_2(&mut arr, &mut n) }) as i32);
 }

tests/unit/out/unsafe/04_address_taken_array.rs

@@ -18,7 +18,7 @@ unsafe fn main_0() -> i32 {
     let mut arr2_ptr: *mut i32 = arr2.as_mut_ptr();
     (*arr2_ptr.offset((0) as isize)) = 5;
     (*arr2_ptr.offset((1) as isize)) = 6;
-    let arr2_ref1: *mut i32 = &mut arr2[(1) as usize] as *mut i32;
+    let arr2_ref1: *mut i32 = &mut arr2[(1) as usize];
     (*arr2_ref1) = 7;
     assert!((((arr2[(0) as usize]) + (arr2[(1) as usize])) == (12)));
     return 0;

tests/unit/out/unsafe/09_references.rs

@@ -13,10 +13,10 @@ pub fn main() {
 }
 unsafe fn main_0() -> i32 {
     let mut h: i32 = 15;
-    let h_ref1: *mut i32 = &mut h as *mut i32;
+    let h_ref1: *mut i32 = &mut h;
     (*h_ref1) = 16;
     let mut h_ptr: *mut i32 = (h_ref1);
-    let h_ref2: *mut i32 = &mut (*h_ptr) as *mut i32;
+    let h_ref2: *mut i32 = &mut (*h_ptr);
     (*h_ref2) = 17;
     assert!((((*h_ref1) + (*h_ref2)) == (34)));
     return 0;

tests/unit/out/unsafe/11_move.rs

@@ -22,7 +22,7 @@ pub fn main() {
 }
 unsafe fn main_0() -> i32 {
     let mut n: Option<Box<i32>> = Some(Box::new(10));
-    (unsafe { change_0(&mut n as *mut Option<Box<i32>>) });
+    (unsafe { change_0(&mut n) });
     assert!(((*n.as_deref_mut().unwrap()) == (20)));
     return 0;
 }

tests/unit/out/unsafe/13_testing.rs

@@ -13,7 +13,7 @@ pub fn main() {
 }
 unsafe fn main_0() -> i32 {
     let mut a: i32 = 1;
-    let r: *mut i32 = &mut a as *mut i32;
+    let r: *mut i32 = &mut a;
     let mut p: *mut i32 = (&mut a as *mut i32);
     (*r) = 2;
     (*p) = 3;