Fix tests

Author: Rua

c2rust-transpile/src/translator/mod.rs

@@ -4508,7 +4508,7 @@ impl<'c> Translation<'c> {
                         {
                             Ok(val)
                         } else {
-                            let mutbl = if is_const {
+                            let mutbl = if is_const || ctx.is_static {
                                 Mutability::Immutable
                             } else {
                                 Mutability::Mutable

c2rust-transpile/src/translator/operators.rs

@@ -901,6 +901,7 @@ impl<'c> Translation<'c> {
         lrvalue: LRValue,
     ) -> TranslationResult<WithStmts<Box<Expr>>> {
         let CQualTypeId { ctype, .. } = cqual_type;
+        let ty = self.convert_type(ctype)?;
         let resolved_ctype = self.ast_context.resolve_type(ctype);
 
         let mut unary = match name {
@@ -941,8 +942,19 @@ impl<'c> Translation<'c> {
                         Mutability::Mutable
                     };
 
-                    self.use_feature("raw_ref_op");
-                    Ok(arg.map(|a| mk().set_mutbl(mutbl).raw_borrow_expr(a)))
+                    Ok(arg.map(|a| {
+                        self.use_feature("raw_ref_op");
+
+                        if ctx.is_static && matches!(mutbl, Mutability::Mutable) {
+                            // TODO: The currently used nightly doesn't allow `&raw mut` in static
+                            // initialisers, but the latest version does.
+                            // So we take a `&raw const` and then cast.
+                            // Remove this exemption when the version is updated.
+                            mk().cast_expr(mk().raw_borrow_expr(a), ty)
+                        } else {
+                            mk().set_mutbl(mutbl).raw_borrow_expr(a)
+                        }
+                    }))
                 }
             }
             c_ast::UnOp::PreIncrement => self.convert_pre_increment(ctx, cqual_type, true, arg),

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

@@ -12,6 +12,7 @@ input_file: c2rust-transpile/tests/snapshots/arrays.c
     unused_assignments,
     unused_mut
 )]
+#![feature(raw_ref_op)]
 #[derive(Copy, Clone)]
 #[repr(C)]
 pub struct C2RustUnnamed {
@@ -79,11 +80,9 @@ pub unsafe extern "C" fn entry() {
         &[u8; 20],
         &mut [std::ffi::c_char; 20],
     >(b"abc\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");
-    let mut past_end: *mut std::ffi::c_char = &mut *simple
-        .as_mut_ptr()
-        .offset(::core::mem::size_of::<[std::ffi::c_char; 9]>() as isize)
-        as *mut std::ffi::c_char;
-    past_end = &mut *foo.offset(8 as std::ffi::c_int as isize) as *mut std::ffi::c_char;
+    let mut past_end: *mut std::ffi::c_char = &raw mut *(&raw mut simple as *mut std::ffi::c_char)
+        .offset(::core::mem::size_of::<[std::ffi::c_char; 9]>() as isize);
+    past_end = &raw mut *foo.offset(8 as std::ffi::c_int as isize);
 }
 #[no_mangle]
 pub unsafe extern "C" fn short_initializer() {

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

@@ -15,25 +15,26 @@ input_file: c2rust-transpile/tests/snapshots/atomics.c
 #![feature(core_intrinsics)]
 #[no_mangle]
 pub unsafe extern "C" fn c11_atomics(mut x: std::ffi::c_int) -> std::ffi::c_int {
-    *&mut x = 0 as std::ffi::c_int;
-    ::core::intrinsics::atomic_store_seqcst(&mut x, 1 as std::ffi::c_int);
-    ::core::intrinsics::atomic_load_seqcst(&mut x);
-    ::core::intrinsics::atomic_xadd_seqcst(&mut x, 2 as std::ffi::c_int);
-    ::core::intrinsics::atomic_xsub_seqcst(&mut x, 1 as std::ffi::c_int);
-    ::core::intrinsics::atomic_and_seqcst(&mut x, 0xf as std::ffi::c_int);
-    ::core::intrinsics::atomic_or_seqcst(&mut x, 0x10 as std::ffi::c_int);
-    ::core::intrinsics::atomic_nand_seqcst(&mut x, 0xff as std::ffi::c_int);
-    ::core::intrinsics::atomic_xchg_seqcst(&mut x, 42 as std::ffi::c_int);
+    *&raw mut x = 0 as std::ffi::c_int;
+    ::core::intrinsics::atomic_store_seqcst(&raw mut x, 1 as std::ffi::c_int);
+    ::core::intrinsics::atomic_load_seqcst(&raw mut x);
+    ::core::intrinsics::atomic_xadd_seqcst(&raw mut x, 2 as std::ffi::c_int);
+    ::core::intrinsics::atomic_xsub_seqcst(&raw mut x, 1 as std::ffi::c_int);
+    ::core::intrinsics::atomic_and_seqcst(&raw mut x, 0xf as std::ffi::c_int);
+    ::core::intrinsics::atomic_or_seqcst(&raw mut x, 0x10 as std::ffi::c_int);
+    ::core::intrinsics::atomic_nand_seqcst(&raw mut x, 0xff as std::ffi::c_int);
+    ::core::intrinsics::atomic_xchg_seqcst(&raw mut x, 42 as std::ffi::c_int);
     let mut expected: std::ffi::c_int = 42 as std::ffi::c_int;
     let mut desired: std::ffi::c_int = 100 as std::ffi::c_int;
-    let fresh0 = ::core::intrinsics::atomic_cxchg_seqcst_seqcst(&mut x, *&mut expected, desired);
-    *&mut expected = fresh0.0;
+    let fresh0 =
+        ::core::intrinsics::atomic_cxchg_seqcst_seqcst(&raw mut x, *&raw mut expected, desired);
+    *&raw mut expected = fresh0.0;
     fresh0.1;
     expected = 100 as std::ffi::c_int;
     desired = 200 as std::ffi::c_int;
     let fresh1 =
-        ::core::intrinsics::atomic_cxchgweak_seqcst_seqcst(&mut x, *&mut expected, desired);
-    *&mut expected = fresh1.0;
+        ::core::intrinsics::atomic_cxchgweak_seqcst_seqcst(&raw mut x, *&raw mut expected, desired);
+    *&raw mut expected = fresh1.0;
     fresh1.1;
     return x;
 }