Keep repeated-append fixture arithmetic in size_t

Signed-off-by: Perfloop Agent <agent@perfloop.ai>
Signed-off-by: Tomás Senart <ts@perfloop.ai>

Author: perfloop-agent

tests/unit/out/refcount/string_repeat_append.rs

@@ -83,8 +83,8 @@ fn main_0() -> i32 {
                     ));
                     let mut i: usize = 0_usize;
                     'loop_: while (i < length) {
-                        let __rhs = initial[((i as u64)
-                            .wrapping_rem((::std::mem::size_of::<[i8; 5]>() as u64)))
+                        let __rhs = initial[((i)
+                            .wrapping_rem((::std::mem::size_of::<[i8; 5]>() as usize)))
                             as usize];
                         (*s.borrow_mut())[i] = __rhs;
                         i.prefix_inc();
@@ -107,8 +107,8 @@ fn main_0() -> i32 {
                             ({
                                 ({ ((elem!(data, i).read()) as i32) } == {
                                     ((if (i < length) {
-                                        initial[((i as u64).wrapping_rem(
-                                            (::std::mem::size_of::<[i8; 5]>() as u64),
+                                        initial[((i).wrapping_rem(
+                                            (::std::mem::size_of::<[i8; 5]>() as usize),
                                         )) as usize]
                                     } else {
                                         (*character.borrow())

tests/unit/out/unsafe/string_repeat_append.rs

@@ -76,9 +76,8 @@ unsafe fn main_0() -> i32 {
                         .collect();
                     let mut i: usize = 0_usize;
                     'loop_: while ((i) < (length)) {
-                        s[(i)] = initial[((i as u64)
-                            .wrapping_rem((::std::mem::size_of::<[libc::c_char; 5]>() as u64)))
-                            as usize];
+                        s[(i)] = initial[((i)
+                            .wrapping_rem((::std::mem::size_of::<[libc::c_char; 5]>() as usize)))];
                         i.prefix_inc();
                     }
                     if (shrink != 0) {
@@ -95,9 +94,9 @@ unsafe fn main_0() -> i32 {
                         assert!(
                             (((*data.offset((i) as isize)) as i32)
                                 == ((if ((i) < (length)) {
-                                    initial[((i as u64).wrapping_rem(
-                                        (::std::mem::size_of::<[libc::c_char; 5]>() as u64),
-                                    )) as usize]
+                                    initial[((i).wrapping_rem(
+                                        (::std::mem::size_of::<[libc::c_char; 5]>() as usize),
+                                    ))]
                                 } else {
                                     character
                                 }) as i32))

tests/unit/string_repeat_append.cpp

@@ -17,15 +17,16 @@ int main() {
         for (int shrink = 0; shrink < 2; ++shrink) {
           std::string s(length, 'x');
           for (std::size_t i = 0; i < length; ++i)
-            s[i] = initial[i % sizeof(initial)];
+            s[i] = initial[i % std::size_t(sizeof(initial))];
           if (shrink)
             s.shrink_to_fit();
           s.append(count, character);
           assert(s.size() == length + count);
           const char *data = s.data();
           for (std::size_t i = 0; i < length + count; ++i)
-            assert(data[i] ==
-                   (i < length ? initial[i % sizeof(initial)] : character));
+            assert(data[i] == (i < length
+                                   ? initial[i % std::size_t(sizeof(initial))]
+                                   : character));
           assert(data[s.size()] == 0);
           ++cases;
         }