Skip to content

transpile: Properly handle address-of static compound literals - #1644

Merged
ahomescu merged 6 commits into
immunant:masterfrom
Rua:static-compound-literal
May 7, 2026
Merged

transpile: Properly handle address-of static compound literals#1644
ahomescu merged 6 commits into
immunant:masterfrom
Rua:static-compound-literal

Conversation

@Rua

@Rua Rua commented Mar 6, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

This allows limited use of statements in translations of statics, only if the statements are Stmt::Item. This is then used to solve the original bug, by declaring a fresh static variable to take the address of.

This code doesn't currently account for situations in which the compound literal expression needs to be sectioned off for late initialisation, as that would have complicated the code a fair bit further.

@Rua
Rua force-pushed the static-compound-literal branch from dcbe0fa to 8a200eb Compare March 6, 2026 17:49
@Rua
Rua marked this pull request as ready for review March 6, 2026 17:51
@Rua
Rua force-pushed the static-compound-literal branch 4 times, most recently from 4a06d79 to b768426 Compare March 6, 2026 18:51
kkysen
kkysen reviewed Mar 10, 2026
View reviewed changes
Comment thread c2rust-transpile/src/with_stmts.rs Outdated
Comment thread c2rust-transpile/src/translator/mod.rs
Comment thread c2rust-transpile/src/with_stmts.rs Outdated
Comment thread c2rust-transpile/tests/snapshots/snapshots__transpile@compound_literals.c.2021.snap
@Rua
Rua force-pushed the static-compound-literal branch 4 times, most recently from 3e04701 to e485aae Compare March 17, 2026 10:58
@Rua
Rua force-pushed the static-compound-literal branch from e485aae to 2be8ad5 Compare March 23, 2026 18:09
@Rua

Rua commented Mar 23, 2026

Copy link
Copy Markdown
Contributor Author

I realised that in the current nightly, taking the raw address of a static is unsafe, but it's not unsafe in the final stabilised version of the raw_ref_op feature. So I gated that to only apply to the 2021 edition. I also did the same for DeclRefs of variables, where it seemed to have been missing all this time.

@Rua
Rua force-pushed the static-compound-literal branch 2 times, most recently from 3d6951c to dccadf5 Compare March 23, 2026 18:30
@Rua
Rua requested a review from kkysen March 23, 2026 19:05
@Rua
Rua force-pushed the static-compound-literal branch from dccadf5 to 73d247b Compare April 2, 2026 17:32
@Rua
Rua force-pushed the static-compound-literal branch from 73d247b to c805395 Compare April 16, 2026 20:45
@Rua Rua mentioned this pull request Apr 16, 2026
Merged
@Rua
Rua force-pushed the static-compound-literal branch 7 times, most recently from dea45a4 to 2de9a34 Compare April 26, 2026 17:02
@Rua Rua mentioned this pull request Apr 26, 2026
Merged
@Rua
Rua force-pushed the static-compound-literal branch from 2de9a34 to 267a4d6 Compare April 26, 2026 17:25
@Rua
Rua force-pushed the static-compound-literal branch from 267a4d6 to 46abd46 Compare May 2, 2026 08:50
@Rua
Rua force-pushed the static-compound-literal branch from 46abd46 to 987a291 Compare May 5, 2026 09:36
@ahomescu
ahomescu merged commit 410b5ed into immunant:master May 7, 2026
10 checks passed
@Rua
Rua deleted the static-compound-literal branch May 7, 2026 08:04
ahomescu added a commit that referenced this pull request May 8, 2026
@ahomescu
transpile: Remove static_initializer_is_unsafe (#1745)
35eee04 
- Depends on #1644.

This was already slated for removal in a TODO comment, and it doesn't
seem like it's actually needed. `WithStmts` is handling everything
already. Removing this function helps a little towards #1736 as well.
@Rua Rua mentioned this pull request May 9, 2026
Merged
ahomescu added a commit that referenced this pull request May 12, 2026
@ahomescu
transpile: Turn WithStmts methods into builders (#1789)
68ca2e3 
Following the suggestion made at
#1644 (comment).
ahomescu added a commit that referenced this pull request May 30, 2026
@ahomescu
transpile: Fix static compound literal string initializers (#1758)
44f679c 
- Depends on #1644
- Fixes #1410

Say that 10 times fast.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ahomescu ahomescu ahomescu approved these changes
@kkysen kkysen Awaiting requested review from kkysen

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Allow WithStmts in static initialisers to contain statements File-scope compound literal translated incorrectly, causing segfault on write

3 participants

@Rua @ahomescu @kkysen