Replace ptr.offset(x).op with offset!(ptr, x).op in the rules

The latter is more efficient

Author: nunoplopes

rules/arpa_inet/tgt_refcount.rs

@@ -46,7 +46,7 @@ fn f6(a0: i32, a1: AnyPtr, a2: Ptr<i8>, a3: u32) -> Ptr<i8> {
         Some(__s) if (__s.len() as u32) < a3 => {
             let __n = __s.len();
             a2.write_c_bytes(__s.as_bytes());
-            a2.offset(__n).write(0);
+            elem!(a2, __n).write(0);
             a2
         }
         Some(_) => {

rules/cstdlib/tgt_refcount.rs

@@ -85,8 +85,8 @@ fn f9(a0: AnyPtr, a1: usize, a2: usize, a3: fn(AnyPtr, AnyPtr) -> i32) {
             for __b in 0..a2 {
                 let __x = __base.offset(__i * a2 + __b).read();
                 let __y = __base.offset(__min * a2 + __b).read();
-                __base.offset(__i * a2 + __b).write(__y);
-                __base.offset(__min * a2 + __b).write(__x);
+                elem!(__base, __i * a2 + __b).write(__y);
+                elem!(__base, __min * a2 + __b).write(__x);
             }
         }
     }

rules/cstring/tgt_refcount.rs

@@ -200,7 +200,7 @@ fn f28(a0: i32, a1: Ptr<i8>, a2: usize) -> Ptr<i8> {
         __p += 1;
     }
     if a2 > 0 {
-        a1.offset(__len).write(0);
+        elem!(a1, __len).write(0);
     }
     a1
 }
@@ -215,7 +215,7 @@ fn f28(a0: i32, a1: Ptr<i8>, a2: usize) -> i32 {
         __p += 1;
     }
     if a2 > 0 {
-        a1.offset(__len).write(0);
+        elem!(a1, __len).write(0);
     }
     0
 }

rules/pwd/tgt_refcount.rs

@@ -32,7 +32,7 @@ fn f2(a0: u32, a1: Ptr<Passwd>, a2: Ptr<i8>, a3: usize, a4: Ptr<Ptr<Passwd>>) ->
                     __ptrs.push(__buf.offset(__off));
                     let __end = __s.len();
                     __buf.offset(__off).write_c_bytes(__s);
-                    __buf.offset(__off + __end).write(0);
+                    elem!(__buf, __off + __end).write(0);
                     __off += __end + 1;
                 }
                 __pwbuf.with_mut(|__pw| *__pw = Passwd::from_user_in(&__u, &__ptrs));

rules/socket/tgt_refcount.rs

@@ -193,7 +193,7 @@ fn f11(a0: i32, a1: i32, a2: i32, a3: Ptr<i32>) -> i32 {
         Ok((__a, __b)) => {
             let __sv = a3;
             __sv.write(FdRegistry::register(__a));
-            __sv.offset(1).write(FdRegistry::register(__b));
+            elem!(__sv, 1).write(FdRegistry::register(__b));
             0
         }
         Err(__e) => {

rules/stdio/tgt_refcount.rs

@@ -167,7 +167,7 @@ fn f21(a0: Ptr<i8>, a1: usize, a2: Ptr<i8>, va: &[VaArg]) -> i32 {
     if a1 > 0 {
         let __n = ::std::cmp::min(__b.len(), a1 - 1);
         a0.write_c_bytes(&__b[..__n]);
-        a0.offset(__n).write(0);
+        elem!(a0, __n).write(0);
     }
     __b.len() as i32
 }

rules/time/tgt_refcount.rs

@@ -96,7 +96,7 @@ fn f6(a0: Ptr<i8>, a1: usize, a2: Ptr<i8>, a3: Ptr<Tm>) -> usize {
         0
     } else {
         a0.write_c_bytes(__text.as_bytes());
-        a0.offset(__text.len()).write(0);
+        elem!(a0, __text.len()).write(0);
         __text.len()
     }
 }

rules/unistd/tgt_refcount.rs

@@ -51,7 +51,7 @@ fn f5(a0: Ptr<i32>) -> i32 {
         Ok((__r, __w)) => {
             let __fds = a0;
             __fds.write(FdRegistry::register(__r));
-            __fds.offset(1).write(FdRegistry::register(__w));
+            elem!(__fds, 1).write(FdRegistry::register(__w));
             0
         }
         Err(__e) => {
@@ -92,7 +92,7 @@ fn f9(a0: Ptr<i8>, a1: usize) -> i32 {
             let __n = __bytes.len().min(a1.saturating_sub(1));
             if a1 > 0 {
                 a0.write_c_bytes(&__bytes[..__n]);
-                a0.offset(__n).write(0);
+                elem!(a0, __n).write(0);
             }
             0
         }

tests/unit/out/refcount/fcntl.rs

@@ -18,7 +18,7 @@ fn main_0() -> i32 {
             Ok((__r, __w)) => {
                 let __fds = (fds.as_pointer() as Ptr<i32>);
                 __fds.write(FdRegistry::register(__r));
-                __fds.offset(1).write(FdRegistry::register(__w));
+                elem!(__fds, 1).write(FdRegistry::register(__w));
                 0
             }
             Err(__e) => {

tests/unit/out/refcount/inet_pton_ntop.rs

@@ -236,7 +236,7 @@ fn main_0() -> i32 {
                     {
                         let __n = __s.len();
                         (text.as_pointer() as Ptr<i8>).write_c_bytes(__s.as_bytes());
-                        (text.as_pointer() as Ptr<i8>).offset(__n).write(0);
+                        elem!((text.as_pointer() as Ptr::<i8>), __n).write(0);
                         (text.as_pointer() as Ptr<i8>)
                     }
                     Some(_) => {
@@ -293,7 +293,7 @@ fn main_0() -> i32 {
                     {
                         let __n = __s.len();
                         (text.as_pointer() as Ptr<i8>).write_c_bytes(__s.as_bytes());
-                        (text.as_pointer() as Ptr<i8>).offset(__n).write(0);
+                        elem!((text.as_pointer() as Ptr::<i8>), __n).write(0);
                         (text.as_pointer() as Ptr<i8>)
                     }
                     Some(_) => {
@@ -342,7 +342,7 @@ fn main_0() -> i32 {
                 Some(__s) if (__s.len() as u32) < 4_u32 => {
                     let __n = __s.len();
                     (text.as_pointer() as Ptr<i8>).write_c_bytes(__s.as_bytes());
-                    (text.as_pointer() as Ptr<i8>).offset(__n).write(0);
+                    elem!((text.as_pointer() as Ptr::<i8>), __n).write(0);
                     (text.as_pointer() as Ptr<i8>)
                 }
                 Some(_) => {