transpile: Don't use named reference for binary conditionals

Author: Rua

c2rust-transpile/src/translator/mod.rs

@@ -3379,9 +3379,10 @@ impl<'c> Translation<'c> {
             }
 
             BinaryConditional(ty, lhs, rhs) => {
+                let rhs = self.convert_expr(ctx, rhs, None)?;
+
                 if ctx.is_unused() {
                     let mut lhs = self.convert_condition(ctx, false, lhs)?;
-                    let rhs = self.convert_expr(ctx, rhs, None)?;
                     lhs.merge_unsafe(rhs.is_unsafe());
 
                     lhs.and_then(|val| {
@@ -3397,19 +3398,27 @@ impl<'c> Translation<'c> {
                         ))
                     })
                 } else {
-                    self.name_reference_write_read(ctx, lhs)?.result_map(
-                        |NamedReference {
-                             rvalue: lhs_val, ..
-                         }| {
-                            let cond = self.match_bool(ctx, true, ty.ctype, lhs_val.clone())?;
-                            let ite = mk().ifte_expr(
-                                cond,
-                                mk().block(vec![mk().expr_stmt(lhs_val)]),
-                                Some(self.convert_expr(ctx, rhs, None)?.to_expr()),
-                            );
-                            Ok(ite)
-                        },
-                    )
+                    let mut lhs = self.convert_expr(ctx.used(), lhs, None)?;
+                    lhs.merge_unsafe(rhs.is_unsafe());
+                    let fresh_name = self.renamer.borrow_mut().fresh();
+
+                    lhs.and_then(|lhs| {
+                        let fresh_stmt = mk().local_stmt(Box::new(mk().local(
+                            mk().ident_pat(&fresh_name),
+                            None,
+                            Some(lhs),
+                        )));
+
+                        let cond =
+                            self.match_bool(ctx, true, ty.ctype, mk().ident_expr(&fresh_name))?;
+                        let ite = mk().ifte_expr(
+                            cond,
+                            mk().block(vec![mk().expr_stmt(mk().ident_expr(&fresh_name))]),
+                            Some(rhs.to_expr()),
+                        );
+
+                        Ok(WithStmts::new(vec![fresh_stmt], ite))
+                    })
                 }
             }
 

c2rust-transpile/tests/snapshots/snapshots__transpile@conditions.c.2021.snap

@@ -132,17 +132,17 @@ pub unsafe extern "C" fn binary_conditional_operator(
     sz: ::core::ffi::c_uint,
     buf: *mut ::core::ffi::c_int,
 ) {
-    let ref mut c2rust_fresh1 = id(0 as ::core::ffi::c_int);
+    let c2rust_fresh1 = id(0 as ::core::ffi::c_int);
     *(buf as *mut ::core::ffi::c_int).offset(0 as ::core::ffi::c_int as isize) =
-        if *c2rust_fresh1 != 0 {
-            *c2rust_fresh1
+        if c2rust_fresh1 != 0 {
+            c2rust_fresh1
         } else {
             id(1 as ::core::ffi::c_int)
         };
-    let ref mut c2rust_fresh2 = id(2 as ::core::ffi::c_int);
+    let c2rust_fresh2 = id(2 as ::core::ffi::c_int);
     *(buf as *mut ::core::ffi::c_int).offset(1 as ::core::ffi::c_int as isize) =
-        if *c2rust_fresh2 != 0 {
-            *c2rust_fresh2
+        if c2rust_fresh2 != 0 {
+            c2rust_fresh2
         } else {
             id(3 as ::core::ffi::c_int)
         };

c2rust-transpile/tests/snapshots/snapshots__transpile@conditions.c.2024.snap

@@ -132,17 +132,17 @@ pub unsafe extern "C" fn binary_conditional_operator(
     sz: ::core::ffi::c_uint,
     buf: *mut ::core::ffi::c_int,
 ) {
-    let ref mut c2rust_fresh1 = id(0 as ::core::ffi::c_int);
+    let c2rust_fresh1 = id(0 as ::core::ffi::c_int);
     *(buf as *mut ::core::ffi::c_int).offset(0 as ::core::ffi::c_int as isize) =
-        if *c2rust_fresh1 != 0 {
-            *c2rust_fresh1
+        if c2rust_fresh1 != 0 {
+            c2rust_fresh1
         } else {
             id(1 as ::core::ffi::c_int)
         };
-    let ref mut c2rust_fresh2 = id(2 as ::core::ffi::c_int);
+    let c2rust_fresh2 = id(2 as ::core::ffi::c_int);
     *(buf as *mut ::core::ffi::c_int).offset(1 as ::core::ffi::c_int as isize) =
-        if *c2rust_fresh2 != 0 {
-            *c2rust_fresh2
+        if c2rust_fresh2 != 0 {
+            c2rust_fresh2
         } else {
             id(3 as ::core::ffi::c_int)
         };