rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix -Zsanitizer=kcfi on #[naked] functions

Browse Source 
And more broadly only codegen `InstanceKind::Item` using the naked
function codegen code. Other instance kinds should follow the normal
path.
This commit is contained in:
Folkert de Vries
2025-07-01 20:02:31 +02:00
parent 9c3064e131
commit f100767dce
4 changed files with 91 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
compiler/rustc_codegen_cranelift/src/driver/aot.rs
View File

@@ -530,8 +530,12 @@ fn codegen_cgu_content(
for (mono_item, item_data) in mono_items {
match mono_item {
MonoItem::Fn(instance) => {
if tcx.codegen_fn_attrs(instance.def_id()).flags.contains(CodegenFnAttrFlags::NAKED)
{
// Other `InstanceKind`s (e.g. `ReifyShim` generated by indirect calls) should be
// codegened like a normal function.
let is_item_instance = matches!(instance.def, InstanceKind::Item(_));
let flags = tcx.codegen_fn_attrs(instance.def_id()).flags;
if is_item_instance && flags.contains(CodegenFnAttrFlags::NAKED) {
rustc_codegen_ssa::mir::naked_asm::codegen_naked_asm(
&mut GlobalAsmContext { tcx, global_asm: &mut cx.global_asm },
instance,