shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[SelectionDAG] [KCFI] Allow "kcfi" on invoke (#148742)

Browse Source 
This is handled in CallBase, so it is valid for both call and invoke
This commit is contained in:
Florian Mayer 2025-07-14 18:55:09 -07:00 committed by GitHub
parent 27b3b4a665
commit 14dc3e3d5f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
View File

@ -3355,7 +3355,7 @@ void SelectionDAGBuilder::visitInvoke(const InvokeInst &I) {
{LLVMContext::OB_deopt, LLVMContext::OB_gc_transition, {LLVMContext::OB_deopt, LLVMContext::OB_gc_transition,
LLVMContext::OB_gc_live, LLVMContext::OB_funclet, LLVMContext::OB_gc_live, LLVMContext::OB_funclet,
LLVMContext::OB_cfguardtarget, LLVMContext::OB_ptrauth, LLVMContext::OB_cfguardtarget, LLVMContext::OB_ptrauth,
LLVMContext::OB_clang_arc_attachedcall})) LLVMContext::OB_clang_arc_attachedcall, LLVMContext::OB_kcfi}))
reportFatalUsageError( reportFatalUsageError(
"cannot lower invokes with arbitrary operand bundles!"); "cannot lower invokes with arbitrary operand bundles!");

23
llvm/test/CodeGen/X86/kcfi.ll
View File

@ -138,6 +138,29 @@ define void @f8() {
ret void ret void
} }
declare i32 @__gxx_personality_v0(...)
define void @f9() personality ptr @__gxx_personality_v0 {
; MIR-LABEL: name: f9
; MIR: body:
; ISEL: CALL64m killed %0, 1, $noreg, 0, $noreg, csr_64, implicit $rsp, implicit $ssp, implicit-def $rsp, implicit-def $ssp, cfi-type 12345678
; KCFI: $r11 = MOV64rm killed renamable $rax, 1, $noreg, 0, $noreg
; KCFI-NEXT: BUNDLE{{.*}} {
; KCFI-NEXT: KCFI_CHECK $r11, 12345678, implicit-def $r10, implicit-def $r11, implicit-def $eflags
; KCFI-NEXT: CALL64r internal $r11, csr_64, implicit $rsp, implicit $ssp, implicit-def $rsp, implicit-def $ssp
; KCFI-NEXT: }
%1 = load ptr, ptr @g, align 8
invoke void %1() [ "kcfi"(i32 12345678) ]
to label %cont
unwind label %err
cont:
ret void
err:
%exn = landingpad { i8*, i32 }
catch i8* null
resume { i8*, i32 } %exn
}
attributes #0 = { "target-features"="+retpoline-indirect-branches,+retpoline-indirect-calls" } attributes #0 = { "target-features"="+retpoline-indirect-branches,+retpoline-indirect-calls" }
!llvm.module.flags = !{!0} !llvm.module.flags = !{!0}