Skip to content

style: restore rustfmt on linker.rs, red on main since #7355 #7361

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

Merged
proggeramlug merged 1 commit into from
Aug 4, 2026
Merged

style: restore rustfmt on linker.rs, red on main since #7355 #7361

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 12 additions & 11 deletions crates/perry-codegen/src/linker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,19 +511,23 @@ fn build_clang_compile_plan(
/// Matched on the ` within ` instruction syntax rather than the bare opcode
/// names so a user string literal containing "catchpad" cannot trip it.
pub(crate) fn rs4gc_funclet_refusal(ll_text: &str) -> Option<String> {
["catchswitch within ", "catchpad within ", "cleanuppad within "]
.iter()
.any(|needle| ll_text.contains(needle))
.then(|| {
"PERRY_RS4GC: this module contains a `try`/`catch` that lowered to \
[
"catchswitch within ",
"catchpad within ",
"cleanuppad within ",
]
.iter()
.any(|needle| ll_text.contains(needle))
.then(|| {
"PERRY_RS4GC: this module contains a `try`/`catch` that lowered to \
WinEH funclet pads (catchswitch/catchpad — the windows-msvc EH \
shape), and LLVM's rewrite-statepoints-for-gc pass does not \
support funclet EH: it crashes with an access violation rather \
than reporting anything. Refusing before the pass runs. \
Compile without PERRY_RS4GC, or keep `try` out of RS4GC-compiled \
modules on Windows. Tracked in #7354."
.to_string()
})
.to_string()
})
}

fn maybe_rs4gc_preprocess(ll_text: &str) -> Result<Option<String>> {
Expand Down Expand Up @@ -584,10 +588,7 @@ fn maybe_rs4gc_preprocess(ll_text: &str) -> Result<Option<String>> {
// left only a symbol-less stack dump. Write the exact input next to
// the other failure artifacts and name it, so the crash is
// reproducible with one command.
let ir_path = env::temp_dir().join(format!(
"perry_rs4gc_failed_{}.ll",
std::process::id()
));
let ir_path = env::temp_dir().join(format!("perry_rs4gc_failed_{}.ll", std::process::id()));
let ir_note = match fs::write(&ir_path, ll_text) {
Ok(()) => format!("input IR left at: {}", ir_path.display()),
Err(error) => format!("(could not write input IR: {error})"),
Expand Down
Loading