Hoist fwrite/fread args to avoid borrow errors

lucic71 · lucic71 · commit 2b164e3e2d61 · 2026-05-18T10:04:30.000+01:00
diff --git a/rules/stdio/ir_refcount.json b/rules/stdio/ir_refcount.json
@@ -431,7 +431,7 @@
   "f5": {
     "body": [
       {
-        "text": "libcc2rs::fread_refcount("
+        "text": "let __a0 = "
       },
       {
         "placeholder": {
@@ -440,7 +440,7 @@
         }
       },
       {
-        "text": ", "
+        "text": ";\n    let __a1 = "
       },
       {
         "placeholder": {
@@ -449,7 +449,7 @@
         }
       },
       {
-        "text": ", "
+        "text": ";\n    let __a2 = "
       },
       {
         "placeholder": {
@@ -458,7 +458,7 @@
         }
       },
       {
-        "text": ", "
+        "text": ";\n    let __a3 = "
       },
       {
         "method_call": {
@@ -478,9 +478,10 @@
         }
       },
       {
-        "text": ")"
+        "text": ";\n    libcc2rs::fread_refcount(__a0, __a1, __a2, __a3)"
       }
     ],
+    "multi_statement": true,
     "params": {
       "a0": {
         "type": "AnyPtr"
@@ -503,7 +504,7 @@
   "f6": {
     "body": [
       {
-        "text": "libcc2rs::fwrite_refcount("
+        "text": "let __a0 = "
       },
       {
         "placeholder": {
@@ -512,7 +513,7 @@
         }
       },
       {
-        "text": ", "
+        "text": ";\n    let __a1 = "
       },
       {
         "placeholder": {
@@ -521,7 +522,7 @@
         }
       },
       {
-        "text": ", "
+        "text": ";\n    let __a2 = "
       },
       {
         "placeholder": {
@@ -530,7 +531,7 @@
         }
       },
       {
-        "text": ", "
+        "text": ";\n    let __a3 = "
       },
       {
         "method_call": {
@@ -550,9 +551,10 @@
         }
       },
       {
-        "text": ")"
+        "text": ";\n    libcc2rs::fwrite_refcount(__a0, __a1, __a2, __a3)"
       }
     ],
+    "multi_statement": true,
     "params": {
       "a0": {
         "type": "AnyPtr"
diff --git a/rules/stdio/ir_unsafe.json b/rules/stdio/ir_unsafe.json
@@ -488,7 +488,7 @@
   "f5": {
     "body": [
       {
-        "text": "libcc2rs::fread_unsafe("
+        "text": "let __a0 = "
       },
       {
         "placeholder": {
@@ -497,7 +497,7 @@
         }
       },
       {
-        "text": " as *mut ::std::ffi::c_void, "
+        "text": " as *mut ::std::ffi::c_void;\n    let __a1 = "
       },
       {
         "placeholder": {
@@ -506,7 +506,7 @@
         }
       },
       {
-        "text": ", "
+        "text": ";\n    let __a2 = "
       },
       {
         "placeholder": {
@@ -515,7 +515,7 @@
         }
       },
       {
-        "text": ", "
+        "text": ";\n    let __a3 = "
       },
       {
         "placeholder": {
@@ -524,9 +524,10 @@
         }
       },
       {
-        "text": ")"
+        "text": ";\n    libcc2rs::fread_unsafe(__a0, __a1, __a2, __a3)"
       }
     ],
+    "multi_statement": true,
     "params": {
       "a0": {
         "type": "*mut ::libc::c_void",
@@ -550,7 +551,7 @@
   "f6": {
     "body": [
       {
-        "text": "libcc2rs::fwrite_unsafe("
+        "text": "let __a0 = "
       },
       {
         "placeholder": {
@@ -559,7 +560,7 @@
         }
       },
       {
-        "text": " as *const ::std::ffi::c_void, "
+        "text": " as *const ::std::ffi::c_void;\n    let __a1 = "
       },
       {
         "placeholder": {
@@ -568,7 +569,7 @@
         }
       },
       {
-        "text": ", "
+        "text": ";\n    let __a2 = "
       },
       {
         "placeholder": {
@@ -577,7 +578,7 @@
         }
       },
       {
-        "text": ", "
+        "text": ";\n    let __a3 = "
       },
       {
         "placeholder": {
@@ -586,9 +587,10 @@
         }
       },
       {
-        "text": ")"
+        "text": ";\n    libcc2rs::fwrite_unsafe(__a0, __a1, __a2, __a3)"
       }
     ],
+    "multi_statement": true,
     "params": {
       "a0": {
         "type": "*const ::libc::c_void",
diff --git a/rules/stdio/tgt_refcount.rs b/rules/stdio/tgt_refcount.rs
@@ -56,11 +56,19 @@ fn f4(a0: &mut ::std::fs::File, a1: i64, a2: i32) -> i32 {
 }
 
 fn f5(a0: AnyPtr, a1: u64, a2: u64, a3: Ptr<::std::fs::File>) -> u64 {
-    libcc2rs::fread_refcount(a0, a1, a2, a3.clone())
+    let __a0 = a0;
+    let __a1 = a1;
+    let __a2 = a2;
+    let __a3 = a3.clone();
+    libcc2rs::fread_refcount(__a0, __a1, __a2, __a3)
 }
 
 fn f6(a0: AnyPtr, a1: u64, a2: u64, a3: Ptr<::std::fs::File>) -> u64 {
-    libcc2rs::fwrite_refcount(a0, a1, a2, a3.clone())
+    let __a0 = a0;
+    let __a1 = a1;
+    let __a2 = a2;
+    let __a3 = a3.clone();
+    libcc2rs::fwrite_refcount(__a0, __a1, __a2, __a3)
 }
 
 fn f7(a0: Ptr<::std::fs::File>) -> i32 {
diff --git a/rules/stdio/tgt_unsafe.rs b/rules/stdio/tgt_unsafe.rs
@@ -66,11 +66,19 @@ unsafe fn f4(a0: *mut ::std::fs::File, a1: i64, a2: i32) -> i32 {
 }
 
 unsafe fn f5(a0: *mut ::libc::c_void, a1: u64, a2: u64, a3: *mut ::std::fs::File) -> u64 {
-    libcc2rs::fread_unsafe(a0 as *mut ::std::ffi::c_void, a1, a2, a3)
+    let __a0 = a0 as *mut ::std::ffi::c_void;
+    let __a1 = a1;
+    let __a2 = a2;
+    let __a3 = a3;
+    libcc2rs::fread_unsafe(__a0, __a1, __a2, __a3)
 }
 
 unsafe fn f6(a0: *const ::libc::c_void, a1: u64, a2: u64, a3: *mut ::std::fs::File) -> u64 {
-    libcc2rs::fwrite_unsafe(a0 as *const ::std::ffi::c_void, a1, a2, a3)
+    let __a0 = a0 as *const ::std::ffi::c_void;
+    let __a1 = a1;
+    let __a2 = a2;
+    let __a3 = a3;
+    libcc2rs::fwrite_unsafe(__a0, __a1, __a2, __a3)
 }
 
 unsafe fn f7(a0: *mut ::std::fs::File) -> i32 {
diff --git a/tests/unit/out/refcount/fn_ptr_stdlib_compare.rs b/tests/unit/out/refcount/fn_ptr_stdlib_compare.rs
@@ -102,12 +102,13 @@ fn main_0() -> i32 {
             );
             ((buf.as_pointer() as Ptr<u8>) as Ptr<u8>).to_any().clone()
         };
-        let n: Value<u64> = Rc::new(RefCell::new(libcc2rs::fread_refcount(
-            ((buf.as_pointer() as Ptr<u8>) as Ptr<u8>).to_any(),
-            1_u64,
-            10_u64,
-            (*stream.borrow()).clone(),
-        )));
+        let n: Value<u64> = Rc::new(RefCell::new({
+            let __a0 = ((buf.as_pointer() as Ptr<u8>) as Ptr<u8>).to_any();
+            let __a1 = 1_u64;
+            let __a2 = 10_u64;
+            let __a3 = (*stream.borrow()).clone();
+            libcc2rs::fread_refcount(__a0, __a1, __a2, __a3)
+        }));
         assert!(((*n.borrow()) == 10_u64));
         let i: Value<i32> = Rc::new(RefCell::new(0));
         'loop_: while ((*i.borrow()) < 10) {
@@ -267,12 +268,13 @@ fn main_0() -> i32 {
             );
             ((buf.as_pointer() as Ptr<u8>) as Ptr<u8>).to_any().clone()
         };
-        let n: Value<u64> = Rc::new(RefCell::new(libcc2rs::fwrite_refcount(
-            ((buf.as_pointer() as Ptr<u8>) as Ptr<u8>).to_any(),
-            1_u64,
-            10_u64,
-            (*stream.borrow()).clone(),
-        )));
+        let n: Value<u64> = Rc::new(RefCell::new({
+            let __a0 = ((buf.as_pointer() as Ptr<u8>) as Ptr<u8>).to_any();
+            let __a1 = 1_u64;
+            let __a2 = 10_u64;
+            let __a3 = (*stream.borrow()).clone();
+            libcc2rs::fwrite_refcount(__a0, __a1, __a2, __a3)
+        }));
         assert!(((*n.borrow()) == 10_u64));
         {
             (*stream.borrow()).delete();
diff --git a/tests/unit/out/unsafe/fn_ptr_stdlib_compare.rs b/tests/unit/out/unsafe/fn_ptr_stdlib_compare.rs
@@ -95,12 +95,14 @@ unsafe fn main_0() -> i32 {
             }
             (buf.as_mut_ptr() as *mut u8 as *mut ::libc::c_void)
         };
-        let mut n: u64 = libcc2rs::fread_unsafe(
-            (buf.as_mut_ptr() as *mut u8 as *mut ::libc::c_void) as *mut ::std::ffi::c_void,
-            1_u64,
-            10_u64,
-            stream,
-        );
+        let mut n: u64 = {
+            let __a0 =
+                (buf.as_mut_ptr() as *mut u8 as *mut ::libc::c_void) as *mut ::std::ffi::c_void;
+            let __a1 = 1_u64;
+            let __a2 = 10_u64;
+            let __a3 = stream;
+            libcc2rs::fread_unsafe(__a0, __a1, __a2, __a3)
+        };
         assert!(((n) == (10_u64)));
         let mut i: i32 = 0;
         'loop_: while ((i) < (10)) {
@@ -250,12 +252,14 @@ unsafe fn main_0() -> i32 {
             }
             (buf.as_mut_ptr() as *mut u8 as *mut ::libc::c_void)
         };
-        let mut n: u64 = libcc2rs::fwrite_unsafe(
-            (buf.as_mut_ptr() as *const u8 as *const ::libc::c_void) as *const ::std::ffi::c_void,
-            1_u64,
-            10_u64,
-            stream,
-        );
+        let mut n: u64 = {
+            let __a0 = (buf.as_mut_ptr() as *const u8 as *const ::libc::c_void)
+                as *const ::std::ffi::c_void;
+            let __a1 = 1_u64;
+            let __a2 = 10_u64;
+            let __a3 = stream;
+            libcc2rs::fwrite_unsafe(__a0, __a1, __a2, __a3)
+        };
         assert!(((n) == (10_u64)));
         {
             Box::from_raw(stream);

Original file line number	Diff line number	Diff line change
`@@ -431,7 +431,7 @@`
`431`	`431`	`"f5": {`
`432`	`432`	`"body": [`
`433`	`433`	`{`
`434`		`- "text": "libcc2rs::fread_refcount("`
	`434`	`+ "text": "let __a0 = "`
`435`	`435`	`},`
`436`	`436`	`{`
`437`	`437`	`"placeholder": {`
`@@ -440,7 +440,7 @@`
`440`	`440`	`}`
`441`	`441`	`},`
`442`	`442`	`{`
`443`		`- "text": ", "`
	`443`	`+ "text": ";\n let __a1 = "`
`444`	`444`	`},`
`445`	`445`	`{`
`446`	`446`	`"placeholder": {`
`@@ -449,7 +449,7 @@`
`449`	`449`	`}`
`450`	`450`	`},`
`451`	`451`	`{`
`452`		`- "text": ", "`
	`452`	`+ "text": ";\n let __a2 = "`
`453`	`453`	`},`
`454`	`454`	`{`
`455`	`455`	`"placeholder": {`
`@@ -458,7 +458,7 @@`
`458`	`458`	`}`
`459`	`459`	`},`
`460`	`460`	`{`
`461`		`- "text": ", "`
	`461`	`+ "text": ";\n let __a3 = "`
`462`	`462`	`},`
`463`	`463`	`{`
`464`	`464`	`"method_call": {`
`@@ -478,9 +478,10 @@`
`478`	`478`	`}`
`479`	`479`	`},`
`480`	`480`	`{`
`481`		`- "text": ")"`
	`481`	`+ "text": ";\n libcc2rs::fread_refcount(__a0, __a1, __a2, __a3)"`
`482`	`482`	`}`
`483`	`483`	`],`
	`484`	`+ "multi_statement": true,`
`484`	`485`	`"params": {`
`485`	`486`	`"a0": {`
`486`	`487`	`"type": "AnyPtr"`
`@@ -503,7 +504,7 @@`
`503`	`504`	`"f6": {`
`504`	`505`	`"body": [`
`505`	`506`	`{`
`506`		`- "text": "libcc2rs::fwrite_refcount("`
	`507`	`+ "text": "let __a0 = "`
`507`	`508`	`},`
`508`	`509`	`{`
`509`	`510`	`"placeholder": {`
`@@ -512,7 +513,7 @@`
`512`	`513`	`}`
`513`	`514`	`},`
`514`	`515`	`{`
`515`		`- "text": ", "`
	`516`	`+ "text": ";\n let __a1 = "`
`516`	`517`	`},`
`517`	`518`	`{`
`518`	`519`	`"placeholder": {`
`@@ -521,7 +522,7 @@`
`521`	`522`	`}`
`522`	`523`	`},`
`523`	`524`	`{`
`524`		`- "text": ", "`
	`525`	`+ "text": ";\n let __a2 = "`
`525`	`526`	`},`
`526`	`527`	`{`
`527`	`528`	`"placeholder": {`
`@@ -530,7 +531,7 @@`
`530`	`531`	`}`
`531`	`532`	`},`
`532`	`533`	`{`
`533`		`- "text": ", "`
	`534`	`+ "text": ";\n let __a3 = "`
`534`	`535`	`},`
`535`	`536`	`{`
`536`	`537`	`"method_call": {`
`@@ -550,9 +551,10 @@`
`550`	`551`	`}`
`551`	`552`	`},`
`552`	`553`	`{`
`553`		`- "text": ")"`
	`554`	`+ "text": ";\n libcc2rs::fwrite_refcount(__a0, __a1, __a2, __a3)"`
`554`	`555`	`}`
`555`	`556`	`],`
	`557`	`+ "multi_statement": true,`
`556`	`558`	`"params": {`
`557`	`559`	`"a0": {`
`558`	`560`	`"type": "AnyPtr"`
Original file line number	Diff line number	Diff line change
`@@ -488,7 +488,7 @@`
`488`	`488`	`"f5": {`
`489`	`489`	`"body": [`
`490`	`490`	`{`
`491`		`- "text": "libcc2rs::fread_unsafe("`
	`491`	`+ "text": "let __a0 = "`
`492`	`492`	`},`
`493`	`493`	`{`
`494`	`494`	`"placeholder": {`
`@@ -497,7 +497,7 @@`
`497`	`497`	`}`
`498`	`498`	`},`
`499`	`499`	`{`
`500`		`- "text": " as *mut ::std::ffi::c_void, "`
	`500`	`+ "text": " as *mut ::std::ffi::c_void;\n let __a1 = "`
`501`	`501`	`},`
`502`	`502`	`{`
`503`	`503`	`"placeholder": {`
`@@ -506,7 +506,7 @@`
`506`	`506`	`}`
`507`	`507`	`},`
`508`	`508`	`{`
`509`		`- "text": ", "`
	`509`	`+ "text": ";\n let __a2 = "`
`510`	`510`	`},`
`511`	`511`	`{`
`512`	`512`	`"placeholder": {`
`@@ -515,7 +515,7 @@`
`515`	`515`	`}`
`516`	`516`	`},`
`517`	`517`	`{`
`518`		`- "text": ", "`
	`518`	`+ "text": ";\n let __a3 = "`
`519`	`519`	`},`
`520`	`520`	`{`
`521`	`521`	`"placeholder": {`
`@@ -524,9 +524,10 @@`
`524`	`524`	`}`
`525`	`525`	`},`
`526`	`526`	`{`
`527`		`- "text": ")"`
	`527`	`+ "text": ";\n libcc2rs::fread_unsafe(__a0, __a1, __a2, __a3)"`
`528`	`528`	`}`
`529`	`529`	`],`
	`530`	`+ "multi_statement": true,`
`530`	`531`	`"params": {`
`531`	`532`	`"a0": {`
`532`	`533`	`"type": "*mut ::libc::c_void",`
`@@ -550,7 +551,7 @@`
`550`	`551`	`"f6": {`
`551`	`552`	`"body": [`
`552`	`553`	`{`
`553`		`- "text": "libcc2rs::fwrite_unsafe("`
	`554`	`+ "text": "let __a0 = "`
`554`	`555`	`},`
`555`	`556`	`{`
`556`	`557`	`"placeholder": {`
`@@ -559,7 +560,7 @@`
`559`	`560`	`}`
`560`	`561`	`},`
`561`	`562`	`{`
`562`		`- "text": " as *const ::std::ffi::c_void, "`
	`563`	`+ "text": " as *const ::std::ffi::c_void;\n let __a1 = "`
`563`	`564`	`},`
`564`	`565`	`{`
`565`	`566`	`"placeholder": {`
`@@ -568,7 +569,7 @@`
`568`	`569`	`}`
`569`	`570`	`},`
`570`	`571`	`{`
`571`		`- "text": ", "`
	`572`	`+ "text": ";\n let __a2 = "`
`572`	`573`	`},`
`573`	`574`	`{`
`574`	`575`	`"placeholder": {`
`@@ -577,7 +578,7 @@`
`577`	`578`	`}`
`578`	`579`	`},`
`579`	`580`	`{`
`580`		`- "text": ", "`
	`581`	`+ "text": ";\n let __a3 = "`
`581`	`582`	`},`
`582`	`583`	`{`
`583`	`584`	`"placeholder": {`
`@@ -586,9 +587,10 @@`
`586`	`587`	`}`
`587`	`588`	`},`
`588`	`589`	`{`
`589`		`- "text": ")"`
	`590`	`+ "text": ";\n libcc2rs::fwrite_unsafe(__a0, __a1, __a2, __a3)"`
`590`	`591`	`}`
`591`	`592`	`],`
	`593`	`+ "multi_statement": true,`
`592`	`594`	`"params": {`
`593`	`595`	`"a0": {`
`594`	`596`	`"type": "*const ::libc::c_void",`
Original file line number	Diff line number	Diff line change
`@@ -56,11 +56,19 @@ fn f4(a0: &mut ::std::fs::File, a1: i64, a2: i32) -> i32 {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`fn f5(a0: AnyPtr, a1: u64, a2: u64, a3: Ptr<::std::fs::File>) -> u64 {`
`59`		`- libcc2rs::fread_refcount(a0, a1, a2, a3.clone())`
	`59`	`+ let __a0 = a0;`
	`60`	`+ let __a1 = a1;`
	`61`	`+ let __a2 = a2;`
	`62`	`+ let __a3 = a3.clone();`
	`63`	`+ libcc2rs::fread_refcount(__a0, __a1, __a2, __a3)`
`60`	`64`	`}`
`61`	`65`
`62`	`66`	`fn f6(a0: AnyPtr, a1: u64, a2: u64, a3: Ptr<::std::fs::File>) -> u64 {`
`63`		`- libcc2rs::fwrite_refcount(a0, a1, a2, a3.clone())`
	`67`	`+ let __a0 = a0;`
	`68`	`+ let __a1 = a1;`
	`69`	`+ let __a2 = a2;`
	`70`	`+ let __a3 = a3.clone();`
	`71`	`+ libcc2rs::fwrite_refcount(__a0, __a1, __a2, __a3)`
`64`	`72`	`}`
`65`	`73`
`66`	`74`	`fn f7(a0: Ptr<::std::fs::File>) -> i32 {`
Original file line number	Diff line number	Diff line change
`@@ -66,11 +66,19 @@ unsafe fn f4(a0: *mut ::std::fs::File, a1: i64, a2: i32) -> i32 {`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`unsafe fn f5(a0: mut ::libc::c_void, a1: u64, a2: u64, a3: mut ::std::fs::File) -> u64 {`
`69`		`- libcc2rs::fread_unsafe(a0 as *mut ::std::ffi::c_void, a1, a2, a3)`
	`69`	`+ let __a0 = a0 as *mut ::std::ffi::c_void;`
	`70`	`+ let __a1 = a1;`
	`71`	`+ let __a2 = a2;`
	`72`	`+ let __a3 = a3;`
	`73`	`+ libcc2rs::fread_unsafe(__a0, __a1, __a2, __a3)`
`70`	`74`	`}`
`71`	`75`
`72`	`76`	`unsafe fn f6(a0: const ::libc::c_void, a1: u64, a2: u64, a3: mut ::std::fs::File) -> u64 {`
`73`		`- libcc2rs::fwrite_unsafe(a0 as *const ::std::ffi::c_void, a1, a2, a3)`
	`77`	`+ let __a0 = a0 as *const ::std::ffi::c_void;`
	`78`	`+ let __a1 = a1;`
	`79`	`+ let __a2 = a2;`
	`80`	`+ let __a3 = a3;`
	`81`	`+ libcc2rs::fwrite_unsafe(__a0, __a1, __a2, __a3)`
`74`	`82`	`}`
`75`	`83`
`76`	`84`	`unsafe fn f7(a0: *mut ::std::fs::File) -> i32 {`