maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[AArch64] Fix for BTI landing pad insertion with PAC-RET+bkey. 

EMITBKEY is emitted for PAC-RET+bkey, which is a non machine instructions.

PR: 49957

Reviewed By: eugenis

Differential Revision: https://reviews.llvm.org/D100996
This commit is contained in:
Daniel Kiss 2021-04-23 10:06:15 +02:00
parent a46bbc14f0
commit b1f463dcae
2 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
llvm/lib/Target/AArch64/AArch64BranchTargets.cpp
View File

@ -121,8 +121,10 @@ void AArch64BranchTargets::addBTI(MachineBasicBlock &MBB, bool CouldCall,
auto MBBI = MBB.begin(); auto MBBI = MBB.begin();
// Skip the meta instuctions, those will be removed anyway. // Skip the meta instructions, those will be removed anyway.
for (; MBBI != MBB.end() && MBBI->isMetaInstruction(); ++MBBI) for (; MBBI != MBB.end() &&
(MBBI->isMetaInstruction() || MBBI->getOpcode() == AArch64::EMITBKEY);
++MBBI)
; ;
// SCTLR_EL1.BT[01] is set to 0 by default which means // SCTLR_EL1.BT[01] is set to 0 by default which means

30
llvm/test/CodeGen/AArch64/sign-return-address.ll
View File

@ -122,3 +122,33 @@ define i32 @leaf_sign_all_b_key(i32 %x) "sign-return-address"="all" "sign-return
define i32 @leaf_sign_all_v83_b_key(i32 %x) "sign-return-address"="all" "target-features"="+v8.3a" "sign-return-address-key"="b_key" { define i32 @leaf_sign_all_v83_b_key(i32 %x) "sign-return-address"="all" "target-features"="+v8.3a" "sign-return-address-key"="b_key" {
ret i32 %x ret i32 %x
} }
; CHECK-LABEL: @leaf_sign_all_a_key_bti
; CHECK-NOT: hint #34
; CHECK: hint #25
; CHECK: hint #29
; CHECK-V83A: paciasp
; CHECK-V83A: retaa
define i32 @leaf_sign_all_a_key_bti(i32 %x) "sign-return-address"="all" "sign-return-address-key"="a_key" "branch-target-enforcement"="true"{
ret i32 %x
}
; CHECK-LABEL: @leaf_sign_all_b_key_bti
; CHECK-NOT: hint #34
; CHECK: hint #27
; CHECK: hint #31
; CHECK-V83A: pacibsp
; CHECK-V83A: retab
define i32 @leaf_sign_all_b_key_bti(i32 %x) "sign-return-address"="all" "sign-return-address-key"="b_key" "branch-target-enforcement"="true"{
ret i32 %x
}
; CHECK-LABEL: @leaf_sign_all_v83_b_key_bti
; CHECK-NOT: hint #34
; CHECK: pacibsp
; CHECK-NOT: ret
; CHECK: retab
; CHECK-NOT: ret
define i32 @leaf_sign_all_v83_b_key_bti(i32 %x) "sign-return-address"="all" "target-features"="+v8.3a" "sign-return-address-key"="b_key" "branch-target-enforcement"="true" {
ret i32 %x
}