Match LLVM behavior more closely

checkraisefold · davidtwco · web-flow · commit f81ebfb485c1 · 2025-01-13T18:07:19.000-08:00
Co-authored-by: David Wood &lt;agile.lion3441@fuligin.ink&gt;
diff --git a/compiler/rustc_codegen_ssa/src/back/symbol_export.rs b/compiler/rustc_codegen_ssa/src/back/symbol_export.rs
@@ -577,7 +577,7 @@ pub(crate) fn linking_symbol_name_for_instance_in_crate<'tcx>(
     }
 
     let prefix = match &target.arch[..] {
-        "x86" if target.is_like_windows && undecorated.starts_with("?") => return undecorated,
+        "x86" | "x86_64" if target.is_like_msvc && undecorated.starts_with("?") => return undecorated,
         "x86" => Some('_'),
         "x86_64" => None,
         "arm64ec" => Some('#'),

Original file line number	Diff line number	Diff line change
`@@ -577,7 +577,7 @@ pub(crate) fn linking_symbol_name_for_instance_in_crate<'tcx>(`
`577`	`577`	`}`
`578`	`578`
`579`	`579`	`let prefix = match &target.arch[..] {`
`580`		`- "x86" if target.is_like_windows && undecorated.starts_with("?") => return undecorated,`
	`580`	`+ "x86" \| "x86_64" if target.is_like_msvc && undecorated.starts_with("?") => return undecorated,`
`581`	`581`	`"x86" => Some('_'),`
`582`	`582`	`"x86_64" => None,`
`583`	`583`	`"arm64ec" => Some('#'),`