Skip to content

transpile: Fix static compound literal string initializers #1758

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Rua wants to merge 2 commits into
base: master
Choose a base branch
from
Open

transpile: Fix static compound literal string initializers #1758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2fabc7
transpile: Use descriptive names for `fresh` in `convert_compound_lit…
Rua May 15, 2026
d983138
transpile: Fix static compound literal string initializers
Rua May 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions c2rust-transpile/src/c_ast/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -691,6 +691,15 @@ impl TypedAstContext {
}
}

/// Unwraps a constant expression, if there is one.
pub fn unwrap_constant_expr(&self, expr_id: CExprId) -> CExprId {
if let CExprKind::ConstantExpr(_, subexpr, _) = self[expr_id].kind {
subexpr
} else {
expr_id
}
}

/// Unwraps the underlying expression beneath any casts.
pub fn unwrap_cast_expr(&self, mut expr_id: CExprId) -> CExprId {
while let CExprKind::Paren(_, subexpr)
Expand Down
4 changes: 3 additions & 1 deletion c2rust-transpile/src/translator/literals.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ impl<'c> Translation<'c> {
return self.convert_expr(ctx, val, override_ty);
}

let fresh_name = self.renamer.borrow_mut().fresh();
let fresh_name = self.renamer.borrow_mut().pick_name("c2rust_lvalue");
let fresh_ty = self.convert_type(override_ty.unwrap_or(qty).ctype)?;

// Translate the expression to be assigned to the fresh variable.
Expand Down Expand Up @@ -259,6 +259,7 @@ impl<'c> Translation<'c> {
// * the expr kind being a string literal (`CExprKind::Literal` of a `CLiteral::String`).
let is_string_literal = |id: CExprId| {
let ty_kind = &self.ast_context.resolve_type(ty).kind;
let id = self.ast_context.unwrap_constant_expr(id);
let expr_kind = &self.ast_context.index(id).kind;
let is_char_array = matches!(*ty_kind, CTypeKind::Char);
let is_str_literal =
Expand All @@ -267,6 +268,7 @@ impl<'c> Translation<'c> {
};

let is_zero_literal = |id: CExprId| {
let id = self.ast_context.unwrap_constant_expr(id);
matches!(
self.ast_context.index(id).kind,
CExprKind::Literal(_, CLiteral::Integer(0, _base))
Expand Down
7 changes: 2 additions & 5 deletions c2rust-transpile/tests/snapshots/compound_literals.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,8 @@ 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" };
//char (*static_char_array_ptr)[6] = &(char[]) { "hello" };
char *static_char_ptr_to_array = (char[]) { "hello" };
char (*static_char_array_ptr)[6] = &(char[]) { "hello" };

#define SINGLE_INT ((int) { 42 })
#define INT_ARRAY ((int[]) { 42, 9001 })
Expand Down
46 changes: 28 additions & 18 deletions c2rust-transpile/tests/snapshots/snapshots__transpile@compound_literals.c.2021.clang15.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,32 @@ expression: cat tests/snapshots/compound_literals.2021.clang15.rs
#![feature(raw_ref_op)]
#[no_mangle]
pub static mut static_single_int: ::core::ffi::c_int = 42;
static mut c2rust_fresh0: ::core::ffi::c_int = 42;
static mut c2rust_lvalue: ::core::ffi::c_int = 42;
#[no_mangle]
pub static mut static_single_int_ptr: *mut ::core::ffi::c_int =
unsafe { &raw const c2rust_fresh0 as *mut ::core::ffi::c_int };
static mut c2rust_fresh1: [::core::ffi::c_int; 2] = [42, 9001];
unsafe { &raw const c2rust_lvalue as *mut ::core::ffi::c_int };
static mut c2rust_lvalue_0: [::core::ffi::c_int; 2] = [42, 9001];
#[no_mangle]
pub static mut static_int_ptr_to_array: *mut ::core::ffi::c_int =
unsafe { &raw const c2rust_fresh1 as *mut ::core::ffi::c_int };
static mut c2rust_fresh2: [::core::ffi::c_int; 2] = [42, 9001];
unsafe { &raw const c2rust_lvalue_0 as *mut ::core::ffi::c_int };
static mut c2rust_lvalue_1: [::core::ffi::c_int; 2] = [42, 9001];
#[no_mangle]
pub static mut static_volatile_int_ptr_to_array: *mut ::core::ffi::c_int =
unsafe { &raw const c2rust_fresh2 as *mut ::core::ffi::c_int as *mut ::core::ffi::c_int };
static mut c2rust_fresh3: [::core::ffi::c_int; 2] = [42, 9001];
unsafe { &raw const c2rust_lvalue_1 as *mut ::core::ffi::c_int as *mut ::core::ffi::c_int };
static mut c2rust_lvalue_2: [::core::ffi::c_int; 2] = [42, 9001];
#[no_mangle]
pub static mut static_int_array_ptr: *mut [::core::ffi::c_int; 2] =
unsafe { &raw const c2rust_fresh3 as *mut [::core::ffi::c_int; 2] };
unsafe { &raw const c2rust_lvalue_2 as *mut [::core::ffi::c_int; 2] };
static mut c2rust_lvalue_3: [::core::ffi::c_char; 6] =
unsafe { ::core::mem::transmute::<[u8; 6], [::core::ffi::c_char; 6]>(*b"hello\0") };
#[no_mangle]
pub static mut static_char_ptr_to_array: *mut ::core::ffi::c_char =
unsafe { &raw const c2rust_lvalue_3 as *mut ::core::ffi::c_char };
static mut c2rust_lvalue_4: [::core::ffi::c_char; 6] =
unsafe { ::core::mem::transmute::<[u8; 6], [::core::ffi::c_char; 6]>(*b"hello\0") };
#[no_mangle]
pub static mut static_char_array_ptr: *mut [::core::ffi::c_char; 6] =
unsafe { &raw const c2rust_lvalue_4 as *mut [::core::ffi::c_char; 6] };
pub const SINGLE_INT: ::core::ffi::c_int = 42 as ::core::ffi::c_int;
pub const INT_ARRAY: [::core::ffi::c_int; 2] =
[42 as ::core::ffi::c_int, 9001 as ::core::ffi::c_int];
Expand All @@ -38,22 +48,22 @@ pub const CHAR_ARRAY: [::core::ffi::c_char; 6] =
#[no_mangle]
pub unsafe extern "C" fn local_compound_literals() {
let mut single_int: ::core::ffi::c_int = 42 as ::core::ffi::c_int;
let mut c2rust_fresh4: ::core::ffi::c_int = 42 as ::core::ffi::c_int;
let mut single_int_ptr: *mut ::core::ffi::c_int = &raw mut c2rust_fresh4;
let mut c2rust_fresh5: [::core::ffi::c_int; 2] =
let mut c2rust_lvalue_5: ::core::ffi::c_int = 42 as ::core::ffi::c_int;
let mut single_int_ptr: *mut ::core::ffi::c_int = &raw mut c2rust_lvalue_5;
let mut c2rust_lvalue_6: [::core::ffi::c_int; 2] =
[42 as ::core::ffi::c_int, 9001 as ::core::ffi::c_int];
let mut int_ptr_to_array: *mut ::core::ffi::c_int =
&raw mut c2rust_fresh5 as *mut ::core::ffi::c_int;
let mut c2rust_fresh6: [::core::ffi::c_char; 6] =
&raw mut c2rust_lvalue_6 as *mut ::core::ffi::c_int;
let mut c2rust_lvalue_7: [::core::ffi::c_char; 6] =
::core::mem::transmute::<[u8; 6], [::core::ffi::c_char; 6]>(*b"hello\0");
let mut char_ptr_to_array: *mut ::core::ffi::c_char =
&raw mut c2rust_fresh6 as *mut ::core::ffi::c_char;
let mut c2rust_fresh7: [::core::ffi::c_int; 2] =
&raw mut c2rust_lvalue_7 as *mut ::core::ffi::c_char;
let mut c2rust_lvalue_8: [::core::ffi::c_int; 2] =
[42 as ::core::ffi::c_int, 9001 as ::core::ffi::c_int];
let mut int_array_ptr: *mut [::core::ffi::c_int; 2] = &raw mut c2rust_fresh7;
let mut c2rust_fresh8: [::core::ffi::c_char; 6] =
let mut int_array_ptr: *mut [::core::ffi::c_int; 2] = &raw mut c2rust_lvalue_8;
let mut c2rust_lvalue_9: [::core::ffi::c_char; 6] =
::core::mem::transmute::<[u8; 6], [::core::ffi::c_char; 6]>(*b"hello\0");
let mut char_array_ptr: *mut [::core::ffi::c_char; 6] = &raw mut c2rust_fresh8;
let mut char_array_ptr: *mut [::core::ffi::c_char; 6] = &raw mut c2rust_lvalue_9;
let mut macro_single_int: ::core::ffi::c_int = SINGLE_INT;
let mut macro_single_int_ptr: *mut ::core::ffi::c_int =
&mut SINGLE_INT as *mut ::core::ffi::c_int;
Expand Down
46 changes: 28 additions & 18 deletions c2rust-transpile/tests/snapshots/snapshots__transpile@compound_literals.c.2024.clang15.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,32 @@ expression: cat tests/snapshots/compound_literals.2024.clang15.rs
)]
#[unsafe(no_mangle)]
pub static mut static_single_int: ::core::ffi::c_int = 42;
static mut c2rust_fresh0: ::core::ffi::c_int = 42;
static mut c2rust_lvalue: ::core::ffi::c_int = 42;
#[unsafe(no_mangle)]
pub static mut static_single_int_ptr: *mut ::core::ffi::c_int =
&raw const c2rust_fresh0 as *mut ::core::ffi::c_int;
static mut c2rust_fresh1: [::core::ffi::c_int; 2] = [42, 9001];
&raw const c2rust_lvalue as *mut ::core::ffi::c_int;
static mut c2rust_lvalue_0: [::core::ffi::c_int; 2] = [42, 9001];
#[unsafe(no_mangle)]
pub static mut static_int_ptr_to_array: *mut ::core::ffi::c_int =
&raw const c2rust_fresh1 as *mut ::core::ffi::c_int;
static mut c2rust_fresh2: [::core::ffi::c_int; 2] = [42, 9001];
&raw const c2rust_lvalue_0 as *mut ::core::ffi::c_int;
static mut c2rust_lvalue_1: [::core::ffi::c_int; 2] = [42, 9001];
#[unsafe(no_mangle)]
pub static mut static_volatile_int_ptr_to_array: *mut ::core::ffi::c_int =
&raw const c2rust_fresh2 as *mut ::core::ffi::c_int as *mut ::core::ffi::c_int;
static mut c2rust_fresh3: [::core::ffi::c_int; 2] = [42, 9001];
&raw const c2rust_lvalue_1 as *mut ::core::ffi::c_int as *mut ::core::ffi::c_int;
static mut c2rust_lvalue_2: [::core::ffi::c_int; 2] = [42, 9001];
#[unsafe(no_mangle)]
pub static mut static_int_array_ptr: *mut [::core::ffi::c_int; 2] =
&raw const c2rust_fresh3 as *mut [::core::ffi::c_int; 2];
&raw const c2rust_lvalue_2 as *mut [::core::ffi::c_int; 2];
static mut c2rust_lvalue_3: [::core::ffi::c_char; 6] =
unsafe { ::core::mem::transmute::<[u8; 6], [::core::ffi::c_char; 6]>(*b"hello\0") };
#[unsafe(no_mangle)]
pub static mut static_char_ptr_to_array: *mut ::core::ffi::c_char =
&raw const c2rust_lvalue_3 as *mut ::core::ffi::c_char;
static mut c2rust_lvalue_4: [::core::ffi::c_char; 6] =
unsafe { ::core::mem::transmute::<[u8; 6], [::core::ffi::c_char; 6]>(*b"hello\0") };
#[unsafe(no_mangle)]
pub static mut static_char_array_ptr: *mut [::core::ffi::c_char; 6] =
&raw const c2rust_lvalue_4 as *mut [::core::ffi::c_char; 6];
pub const SINGLE_INT: ::core::ffi::c_int = 42 as ::core::ffi::c_int;
pub const INT_ARRAY: [::core::ffi::c_int; 2] =
[42 as ::core::ffi::c_int, 9001 as ::core::ffi::c_int];
Expand All @@ -38,22 +48,22 @@ pub const CHAR_ARRAY: [::core::ffi::c_char; 6] =
#[unsafe(no_mangle)]
pub unsafe extern "C" fn local_compound_literals() {
let mut single_int: ::core::ffi::c_int = 42 as ::core::ffi::c_int;
let mut c2rust_fresh4: ::core::ffi::c_int = 42 as ::core::ffi::c_int;
let mut single_int_ptr: *mut ::core::ffi::c_int = &raw mut c2rust_fresh4;
let mut c2rust_fresh5: [::core::ffi::c_int; 2] =
let mut c2rust_lvalue_5: ::core::ffi::c_int = 42 as ::core::ffi::c_int;
let mut single_int_ptr: *mut ::core::ffi::c_int = &raw mut c2rust_lvalue_5;
let mut c2rust_lvalue_6: [::core::ffi::c_int; 2] =
[42 as ::core::ffi::c_int, 9001 as ::core::ffi::c_int];
let mut int_ptr_to_array: *mut ::core::ffi::c_int =
&raw mut c2rust_fresh5 as *mut ::core::ffi::c_int;
let mut c2rust_fresh6: [::core::ffi::c_char; 6] =
&raw mut c2rust_lvalue_6 as *mut ::core::ffi::c_int;
let mut c2rust_lvalue_7: [::core::ffi::c_char; 6] =
::core::mem::transmute::<[u8; 6], [::core::ffi::c_char; 6]>(*b"hello\0");
let mut char_ptr_to_array: *mut ::core::ffi::c_char =
&raw mut c2rust_fresh6 as *mut ::core::ffi::c_char;
let mut c2rust_fresh7: [::core::ffi::c_int; 2] =
&raw mut c2rust_lvalue_7 as *mut ::core::ffi::c_char;
let mut c2rust_lvalue_8: [::core::ffi::c_int; 2] =
[42 as ::core::ffi::c_int, 9001 as ::core::ffi::c_int];
let mut int_array_ptr: *mut [::core::ffi::c_int; 2] = &raw mut c2rust_fresh7;
let mut c2rust_fresh8: [::core::ffi::c_char; 6] =
let mut int_array_ptr: *mut [::core::ffi::c_int; 2] = &raw mut c2rust_lvalue_8;
let mut c2rust_lvalue_9: [::core::ffi::c_char; 6] =
::core::mem::transmute::<[u8; 6], [::core::ffi::c_char; 6]>(*b"hello\0");
let mut char_array_ptr: *mut [::core::ffi::c_char; 6] = &raw mut c2rust_fresh8;
let mut char_array_ptr: *mut [::core::ffi::c_char; 6] = &raw mut c2rust_lvalue_9;
let mut macro_single_int: ::core::ffi::c_int = SINGLE_INT;
let mut macro_single_int_ptr: *mut ::core::ffi::c_int =
&mut SINGLE_INT as *mut ::core::ffi::c_int;
Expand Down
4 changes: 2 additions & 2 deletions c2rust-transpile/tests/snapshots/snapshots__transpile@empty_init.c.2021.clang15.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ pub struct Foo_s {
pub x: ::core::ffi::c_int,
}
pub type Foo_t = Foo_s;
static mut c2rust_fresh0: Scope = Scope {
static mut c2rust_lvalue: Scope = Scope {
next: ::core::ptr::null_mut::<Scope>(),
};
#[no_mangle]
pub static mut scope: *mut Scope = unsafe { &raw const c2rust_fresh0 as *mut Scope };
pub static mut scope: *mut Scope = unsafe { &raw const c2rust_lvalue as *mut Scope };
#[no_mangle]
pub unsafe extern "C" fn foo() {
let mut f: Foo_t = Foo_t { x: 0 };
Expand Down
4 changes: 2 additions & 2 deletions c2rust-transpile/tests/snapshots/snapshots__transpile@empty_init.c.2024.clang15.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ pub struct Foo_s {
pub x: ::core::ffi::c_int,
}
pub type Foo_t = Foo_s;
static mut c2rust_fresh0: Scope = Scope {
static mut c2rust_lvalue: Scope = Scope {
next: ::core::ptr::null_mut::<Scope>(),
};
#[unsafe(no_mangle)]
pub static mut scope: *mut Scope = &raw const c2rust_fresh0 as *mut Scope;
pub static mut scope: *mut Scope = &raw const c2rust_lvalue as *mut Scope;
#[unsafe(no_mangle)]
pub unsafe extern "C" fn foo() {
let mut f: Foo_t = Foo_t { x: 0 };
Expand Down
Loading