transpile: Add tests for #1238 and #1240

Author: Rua

c2rust-transpile/tests/snapshots/arrays.c

@@ -1,7 +1,8 @@
 #include <stdlib.h>
 
-static char simple[] = "mystring";
-static char *foo = "mystring";
+char static_char_array[] = "mystring";
+char *static_char_ptr = "mystring";
+void *static_void_ptr = (void*) static_char_array;
 
 void entry(void) {
     int int_2d[1][1] = { 1 };
@@ -27,7 +28,7 @@ void entry(void) {
 
     int *int_var_ptr = int_empty_init;
     int (*int_var_array_ptr)[16] = &int_empty_init;
-    char *char_var_ptr_var = char_with_string;
+    char *char_var_ptr = char_with_string;
     char (*char_var_array_ptr)[4] = &char_with_string;
     const char *const_char_lit_ptr = "abc";
     const char (*const_char_lit_array_ptr)[4] = &"abc";
@@ -44,8 +45,8 @@ void entry(void) {
 #endif
 
     // Test that we can get the address of the element past the end of the array
-    char *past_end = &simple[sizeof(simple)];
-    past_end = &foo[8];
+    char *past_end = &static_char_array[sizeof(static_char_array)];
+    past_end = &static_char_ptr[8];
 }
 
 void short_initializer() {

c2rust-transpile/tests/snapshots/compound_literals.c

@@ -1,11 +1,12 @@
 int static_single_int = (int) { 42 };
 int *static_single_int_ptr = &((int) { 42 });
 int *static_int_ptr_to_array = (int[]) { 42, 9001 };
+volatile int *static_volatile_int_ptr_to_array = (int[]) { 42, 9001 };
+int (*static_int_array_ptr)[2] = &(int[]) { 42, 9001 };
+
 // Currently generates broken Rust code, see
 // https://github.com/immunant/c2rust/issues/1410
 //char *static_char_ptr_to_array = (char[]) { "hello" };
-int (*static_int_array_ptr)[2] = &(int[]) { 42, 9001 };
-// As above
 //char (*static_char_array_ptr)[6] = &(char[]) { "hello" };
 
 #define SINGLE_INT ((int) { 42 })

c2rust-transpile/tests/snapshots/[email protected]

@@ -34,11 +34,17 @@ pub struct C2RustUnnamed_2 {
     pub x: ::core::ffi::c_short,
     pub y: ::core::ffi::c_int,
 }
-static mut simple: [::core::ffi::c_char; 9] =
+#[no_mangle]
+pub static mut static_char_array: [::core::ffi::c_char; 9] =
     unsafe { ::core::mem::transmute::<[u8; 9], [::core::ffi::c_char; 9]>(*b"mystring\0") };
-static mut foo: *mut ::core::ffi::c_char =
+#[no_mangle]
+pub static mut static_char_ptr: *mut ::core::ffi::c_char =
     b"mystring\0" as *const u8 as *const ::core::ffi::c_char as *mut ::core::ffi::c_char;
 #[no_mangle]
+pub static mut static_void_ptr: *mut ::core::ffi::c_void = unsafe {
+    static_char_array.as_ptr() as *mut _ as *mut ::core::ffi::c_void
+};
+#[no_mangle]
 pub unsafe extern "C" fn entry() {
     let mut int_2d: [[::core::ffi::c_int; 1]; 1] = [[1 as ::core::ffi::c_int]];
     int_2d[0 as ::core::ffi::c_int as usize][0 as ::core::ffi::c_int as usize] +=
@@ -81,7 +87,7 @@ pub unsafe extern "C" fn entry() {
         );
     let mut int_var_ptr: *mut ::core::ffi::c_int = int_empty_init.as_mut_ptr();
     let mut int_var_array_ptr: *mut [::core::ffi::c_int; 16] = &mut int_empty_init;
-    let mut char_var_ptr_var: *mut ::core::ffi::c_char = char_with_string.as_mut_ptr();
+    let mut char_var_ptr: *mut ::core::ffi::c_char = char_with_string.as_mut_ptr();
     let mut char_var_array_ptr: *mut [::core::ffi::c_char; 4] = &mut char_with_string;
     let mut const_char_lit_ptr: *const ::core::ffi::c_char =
         b"abc\0" as *const u8 as *const ::core::ffi::c_char;
@@ -92,11 +98,12 @@ pub unsafe extern "C" fn entry() {
     let mut char_lit_array_ptr: *mut [::core::ffi::c_char; 4] = b"abc\0" as *const [u8; 4]
         as *const [::core::ffi::c_char; 4]
         as *mut [::core::ffi::c_char; 4];
-    let mut past_end: *mut ::core::ffi::c_char = &mut *simple
+    let mut past_end: *mut ::core::ffi::c_char = &mut *static_char_array
         .as_mut_ptr()
         .offset(::core::mem::size_of::<[::core::ffi::c_char; 9]>() as isize)
         as *mut ::core::ffi::c_char;
-    past_end = &mut *foo.offset(8 as ::core::ffi::c_int as isize) as *mut ::core::ffi::c_char;
+    past_end =
+        &mut *static_char_ptr.offset(8 as ::core::ffi::c_int as isize) as *mut ::core::ffi::c_char;
 }
 #[no_mangle]
 pub unsafe extern "C" fn short_initializer() {

c2rust-transpile/tests/snapshots/snapshots__transpile@compound_literals.c.snap

@@ -19,6 +19,9 @@ pub static mut static_single_int_ptr: *mut ::core::ffi::c_int =
 #[no_mangle]
 pub static mut static_int_ptr_to_array: *mut ::core::ffi::c_int = [42, 9001].as_ptr() as *mut _;
 #[no_mangle]
+pub static mut static_volatile_int_ptr_to_array: *mut ::core::ffi::c_int =
+    [42, 9001].as_ptr() as *mut _ as *mut ::core::ffi::c_int;
+#[no_mangle]
 pub static mut static_int_array_ptr: *mut [::core::ffi::c_int; 2] =
     &[42, 9001] as *const [::core::ffi::c_int; 2] as *mut [::core::ffi::c_int; 2];
 pub const SINGLE_INT: ::core::ffi::c_int = 42 as ::core::ffi::c_int;