Fix stale expr kind

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -3008,7 +3008,6 @@ bool Converter::ConvertLValueConditional(clang::ConditionalOperator *expr) {
   }
   // `&(c ? a : b)` -> `c ? &a : &b`
   if (isAddrOf()) {
-    PushExprKind push(*this, ExprKind::RValue);
     Convert(MakeConditionalAddrOf(ctx_, expr));
     return true;
   }
@@ -4860,6 +4859,7 @@ void Converter::ConvertAddrOf(clang::Expr *expr, clang::QualType pointer_type) {
     StrCat("&raw", pointer_type->getPointeeType().isConstQualified()
                        ? keyword::kConst
                        : keyword_mut_);
+    PushExprKind push(*this, ExprKind::LValue);
     Convert(expr);
     ConvertCast(pointer_type);
     computed_expr_type_ = ComputedExprType::FreshPointer;
@@ -4868,6 +4868,7 @@ void Converter::ConvertAddrOf(clang::Expr *expr, clang::QualType pointer_type) {
     if (!pointer_type->getPointeeType().isConstQualified()) {
       StrCat(keyword_mut_);
     }
+    PushExprKind push(*this, ExprKind::LValue);
     Convert(expr);
     ConvertCast(pointer_type);
     computed_expr_type_ = ComputedExprType::FreshPointer;

cpp2rust/converter/models/converter_refcount.cpp

@@ -918,7 +918,7 @@ bool ConverterRefCount::ConvertIncAndDec(clang::UnaryOperator *expr) {
 
 bool ConverterRefCount::VisitConditionalOperator(
     clang::ConditionalOperator *expr) {
-  if (!isAddrOf() && ConvertLValueConditional(expr)) {
+  if (ConvertLValueConditional(expr)) {
     return false;
   }
   StrCat(keyword::kIf);
@@ -3033,6 +3033,14 @@ pub fn main() {{
 
 void ConverterRefCount::ConvertAddrOf(clang::Expr *expr,
                                       clang::QualType pointer_type) {
+  auto pointee_type = pointer_type->getPointeeType();
+  if (isObject() && WantsElementPtr() &&
+      (IsBoxedType(ctx_, pointee_type) || pointee_type->isArrayType())) {
+    StrCat(std::format("Ptr::<{}>::decay(&({}))", ToString(pointee_type),
+                       ConvertPointer(expr)));
+    computed_expr_type_ = ComputedExprType::FreshPointer;
+    return;
+  }
   StrCat(ConvertPointer(expr));
 }
 

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

@@ -30,24 +30,24 @@ fn main_0() -> i32 {
     let a: Value<i32> = Rc::new(RefCell::new(1));
     let b: Value<i32> = Rc::new(RefCell::new(2));
     let r: Ptr<i32> = if ((*a.borrow()) < (*b.borrow())) {
-        a.as_pointer()
+        (a.as_pointer())
     } else {
-        b.as_pointer()
+        (b.as_pointer())
     };
     r.write(10);
     assert!(((*a.borrow()) == 10));
     let cr: Ptr<i32> = if ((*a.borrow()) > (*b.borrow())) {
-        a.as_pointer()
+        (a.as_pointer())
     } else {
-        b.as_pointer()
+        (b.as_pointer())
     };
     assert!(((cr.read()) == 10));
     let x: Value<i32> = Rc::new(RefCell::new(1));
     let y: Value<i32> = Rc::new(RefCell::new(2));
     let cx: Ptr<i32> = if ((*x.borrow()) < (*y.borrow())) {
-        x.as_pointer()
+        (x.as_pointer())
     } else {
-        y.as_pointer()
+        (y.as_pointer())
     };
     assert!(((cx.read()) == 1));
     let mut cp: Ptr<i32> = if ((*a.borrow()) > (*b.borrow())) {
@@ -81,9 +81,9 @@ fn main_0() -> i32 {
     };
     assert!(((*b.borrow()) == 25));
     let mut ap: Ptr<i32> = (if ((*a.borrow()) > (*b.borrow())) {
-        a.as_pointer()
+        (a.as_pointer())
     } else {
-        b.as_pointer()
+        (b.as_pointer())
     });
     ap.write(40);
     assert!(((*a.borrow()) == 40));

tests/unit/out/refcount/vector2.rs

@@ -31,9 +31,9 @@ pub fn fn_0(v: Ptr<Vec<i32>>, v3: Vec<i32>) {
     (*v2.borrow_mut())[0_usize] = 1;
     elem!(
         ((if true {
-            v3.as_pointer()
+            (Ptr::<Vec<i32>>::decay(&(v3.as_pointer())))
         } else {
-            Ptr::<Vec<i32>>::decay(&(v))
+            (Ptr::<Vec<i32>>::decay(&(v)))
         }) as Ptr<i32>),
         0_usize
     )

tests/unit/out/refcount/vector_with_allocator.rs

@@ -26,9 +26,9 @@ pub fn fn_1(v: Ptr<Vec<i32>>, v3: Vec<i32>) {
     v2[0_usize] = 1;
     elem!(
         ((if true {
-            v3.as_pointer()
+            (Ptr::<Vec<i32>>::decay(&(v3.as_pointer())))
         } else {
-            Ptr::<Vec<i32>>::decay(&(v))
+            (Ptr::<Vec<i32>>::decay(&(v)))
         }) as Ptr<i32>),
         0_usize
     )