transpile: Correct uses of used in operators.rs

Author: Rua

c2rust-transpile/src/translator/operators.rs

@@ -212,7 +212,7 @@ impl<'c> Translation<'c> {
             )))
         } else {
             let lhs = self.convert_cast(
-                ctx,
+                ctx.used(),
                 initial_lhs_type_id,
                 compute_lhs_type_id,
                 WithStmts::new_val(read.clone()),
@@ -234,8 +234,15 @@ impl<'c> Translation<'c> {
                 )
             })?;
 
-            let val =
-                self.convert_cast(ctx, compute_res_type_id, lhs_type_id, val, None, None, None)?;
+            let val = self.convert_cast(
+                ctx.used(),
+                compute_res_type_id,
+                lhs_type_id,
+                val,
+                None,
+                None,
+                None,
+            )?;
 
             Ok(val.map(|val| mk().assign_expr(write.clone(), val)))
         }
@@ -424,7 +431,7 @@ impl<'c> Translation<'c> {
                         .expect("Cannot convert non-assignment operator");
 
                     let lhs = self.convert_cast(
-                        ctx,
+                        ctx.used(),
                         initial_lhs_type_id,
                         expr_or_comp_type_id,
                         WithStmts::new_val(read.clone()),
@@ -447,7 +454,7 @@ impl<'c> Translation<'c> {
                     )?;
 
                     let val = self.convert_cast(
-                        ctx,
+                        ctx.used(),
                         result_type_id,
                         expr_type_id,
                         val,
@@ -650,7 +657,7 @@ impl<'c> Translation<'c> {
             };
 
         self.convert_assignment_operator_with_rhs(
-            ctx.used(),
+            ctx,
             op,
             ty,
             arg,
@@ -789,7 +796,7 @@ impl<'c> Translation<'c> {
                 .map(|a| mk().unary_expr(UnOp::Not(Default::default()), a))),
 
             CUnOp::Not => {
-                let val = self.convert_condition(ctx, false, arg)?;
+                let val = self.convert_condition(ctx.used(), false, arg)?;
                 Ok(val.map(|x| mk().cast_expr(x, mk().abs_path_ty(vec!["core", "ffi", "c_int"]))))
             }
             CUnOp::Extension => {

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

@@ -75,27 +75,23 @@ pub unsafe extern "C" fn inc_decl_with_rvalue_side_effect() {
 }
 #[no_mangle]
 pub unsafe extern "C" fn inc_decl_with_lvalue_side_effect() {
+    *lvalue_side_effect() += 1;
+    *lvalue_side_effect() -= 1;
+    *lvalue_side_effect() += 1;
+    *lvalue_side_effect() -= 1;
     let ref mut c2rust_side_effects = *lvalue_side_effect();
     *c2rust_side_effects += 1;
+    let mut pre_inc: ::core::ffi::c_int = *c2rust_side_effects;
     let ref mut c2rust_side_effects_0 = *lvalue_side_effect();
     *c2rust_side_effects_0 -= 1;
+    let mut pre_dec: ::core::ffi::c_int = *c2rust_side_effects_0;
     let ref mut c2rust_side_effects_1 = *lvalue_side_effect();
-    *c2rust_side_effects_1 += 1;
-    let ref mut c2rust_side_effects_2 = *lvalue_side_effect();
-    *c2rust_side_effects_2 -= 1;
-    let ref mut c2rust_side_effects_3 = *lvalue_side_effect();
-    *c2rust_side_effects_3 += 1;
-    let mut pre_inc: ::core::ffi::c_int = *c2rust_side_effects_3;
-    let ref mut c2rust_side_effects_4 = *lvalue_side_effect();
-    *c2rust_side_effects_4 -= 1;
-    let mut pre_dec: ::core::ffi::c_int = *c2rust_side_effects_4;
-    let ref mut c2rust_side_effects_5 = *lvalue_side_effect();
-    let c2rust_fresh2 = *c2rust_side_effects_5;
-    *c2rust_side_effects_5 = *c2rust_side_effects_5 + 1;
+    let c2rust_fresh2 = *c2rust_side_effects_1;
+    *c2rust_side_effects_1 = *c2rust_side_effects_1 + 1;
     let mut post_inc: ::core::ffi::c_int = c2rust_fresh2;
-    let ref mut c2rust_side_effects_6 = *lvalue_side_effect();
-    let c2rust_fresh3 = *c2rust_side_effects_6;
-    *c2rust_side_effects_6 = *c2rust_side_effects_6 - 1;
+    let ref mut c2rust_side_effects_2 = *lvalue_side_effect();
+    let c2rust_fresh3 = *c2rust_side_effects_2;
+    *c2rust_side_effects_2 = *c2rust_side_effects_2 - 1;
     let mut post_dec: ::core::ffi::c_int = c2rust_fresh3;
 }
 #[no_mangle]

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

@@ -75,27 +75,23 @@ pub unsafe extern "C" fn inc_decl_with_rvalue_side_effect() {
 }
 #[unsafe(no_mangle)]
 pub unsafe extern "C" fn inc_decl_with_lvalue_side_effect() {
+    *lvalue_side_effect() += 1;
+    *lvalue_side_effect() -= 1;
+    *lvalue_side_effect() += 1;
+    *lvalue_side_effect() -= 1;
     let ref mut c2rust_side_effects = *lvalue_side_effect();
     *c2rust_side_effects += 1;
+    let mut pre_inc: ::core::ffi::c_int = *c2rust_side_effects;
     let ref mut c2rust_side_effects_0 = *lvalue_side_effect();
     *c2rust_side_effects_0 -= 1;
+    let mut pre_dec: ::core::ffi::c_int = *c2rust_side_effects_0;
     let ref mut c2rust_side_effects_1 = *lvalue_side_effect();
-    *c2rust_side_effects_1 += 1;
-    let ref mut c2rust_side_effects_2 = *lvalue_side_effect();
-    *c2rust_side_effects_2 -= 1;
-    let ref mut c2rust_side_effects_3 = *lvalue_side_effect();
-    *c2rust_side_effects_3 += 1;
-    let mut pre_inc: ::core::ffi::c_int = *c2rust_side_effects_3;
-    let ref mut c2rust_side_effects_4 = *lvalue_side_effect();
-    *c2rust_side_effects_4 -= 1;
-    let mut pre_dec: ::core::ffi::c_int = *c2rust_side_effects_4;
-    let ref mut c2rust_side_effects_5 = *lvalue_side_effect();
-    let c2rust_fresh2 = *c2rust_side_effects_5;
-    *c2rust_side_effects_5 = *c2rust_side_effects_5 + 1;
+    let c2rust_fresh2 = *c2rust_side_effects_1;
+    *c2rust_side_effects_1 = *c2rust_side_effects_1 + 1;
     let mut post_inc: ::core::ffi::c_int = c2rust_fresh2;
-    let ref mut c2rust_side_effects_6 = *lvalue_side_effect();
-    let c2rust_fresh3 = *c2rust_side_effects_6;
-    *c2rust_side_effects_6 = *c2rust_side_effects_6 - 1;
+    let ref mut c2rust_side_effects_2 = *lvalue_side_effect();
+    let c2rust_fresh3 = *c2rust_side_effects_2;
+    *c2rust_side_effects_2 = *c2rust_side_effects_2 - 1;
     let mut post_dec: ::core::ffi::c_int = c2rust_fresh3;
 }
 #[unsafe(no_mangle)]