[llvm] [AArch64] Only create called thunks when hardening against SLS (PR #97472)
via llvm-commits
llvm-commits at lists.llvm.org
Thu Jul 4 07:31:13 PDT 2024
github-actions[bot] wrote:
<!--LLVM CODE FORMAT COMMENT: {clang-format}-->
:warning: C/C++ code formatter, clang-format found issues in your code. :warning:
<details>
<summary>
You can test this locally with the following command:
</summary>
``````````bash
git-clang-format --diff 94a067a306fecceac913cc6d9bfdcd49464358ec 0247af903f2f631cb4dc5dd3d280df4487ad7599 -- llvm/lib/Target/AArch64/AArch64.h llvm/lib/Target/AArch64/AArch64SLSHardening.cpp llvm/lib/Target/AArch64/AArch64TargetMachine.cpp
``````````
</details>
<details>
<summary>
View the diff from clang-format here.
</summary>
``````````diff
diff --git a/llvm/lib/Target/AArch64/AArch64SLSHardening.cpp b/llvm/lib/Target/AArch64/AArch64SLSHardening.cpp
index 24f023a3d7..00ba31b3e5 100644
--- a/llvm/lib/Target/AArch64/AArch64SLSHardening.cpp
+++ b/llvm/lib/Target/AArch64/AArch64SLSHardening.cpp
@@ -144,40 +144,40 @@ static const struct ThunkNameAndReg {
const char* Name;
Register Reg;
} SLSBLRThunks[NumPermittedRegs] = {
- { "__llvm_slsblr_thunk_x0", AArch64::X0},
- { "__llvm_slsblr_thunk_x1", AArch64::X1},
- { "__llvm_slsblr_thunk_x2", AArch64::X2},
- { "__llvm_slsblr_thunk_x3", AArch64::X3},
- { "__llvm_slsblr_thunk_x4", AArch64::X4},
- { "__llvm_slsblr_thunk_x5", AArch64::X5},
- { "__llvm_slsblr_thunk_x6", AArch64::X6},
- { "__llvm_slsblr_thunk_x7", AArch64::X7},
- { "__llvm_slsblr_thunk_x8", AArch64::X8},
- { "__llvm_slsblr_thunk_x9", AArch64::X9},
- { "__llvm_slsblr_thunk_x10", AArch64::X10},
- { "__llvm_slsblr_thunk_x11", AArch64::X11},
- { "__llvm_slsblr_thunk_x12", AArch64::X12},
- { "__llvm_slsblr_thunk_x13", AArch64::X13},
- { "__llvm_slsblr_thunk_x14", AArch64::X14},
- { "__llvm_slsblr_thunk_x15", AArch64::X15},
- // X16 and X17 are deliberately missing, as the mitigation requires those
- // register to not be used in BLR. See comment in ConvertBLRToBL for more
- // details.
- { "__llvm_slsblr_thunk_x18", AArch64::X18},
- { "__llvm_slsblr_thunk_x19", AArch64::X19},
- { "__llvm_slsblr_thunk_x20", AArch64::X20},
- { "__llvm_slsblr_thunk_x21", AArch64::X21},
- { "__llvm_slsblr_thunk_x22", AArch64::X22},
- { "__llvm_slsblr_thunk_x23", AArch64::X23},
- { "__llvm_slsblr_thunk_x24", AArch64::X24},
- { "__llvm_slsblr_thunk_x25", AArch64::X25},
- { "__llvm_slsblr_thunk_x26", AArch64::X26},
- { "__llvm_slsblr_thunk_x27", AArch64::X27},
- { "__llvm_slsblr_thunk_x28", AArch64::X28},
- { "__llvm_slsblr_thunk_x29", AArch64::FP},
- // X30 is deliberately missing, for similar reasons as X16 and X17 are
- // missing.
- { "__llvm_slsblr_thunk_x31", AArch64::XZR},
+ {"__llvm_slsblr_thunk_x0", AArch64::X0},
+ {"__llvm_slsblr_thunk_x1", AArch64::X1},
+ {"__llvm_slsblr_thunk_x2", AArch64::X2},
+ {"__llvm_slsblr_thunk_x3", AArch64::X3},
+ {"__llvm_slsblr_thunk_x4", AArch64::X4},
+ {"__llvm_slsblr_thunk_x5", AArch64::X5},
+ {"__llvm_slsblr_thunk_x6", AArch64::X6},
+ {"__llvm_slsblr_thunk_x7", AArch64::X7},
+ {"__llvm_slsblr_thunk_x8", AArch64::X8},
+ {"__llvm_slsblr_thunk_x9", AArch64::X9},
+ {"__llvm_slsblr_thunk_x10", AArch64::X10},
+ {"__llvm_slsblr_thunk_x11", AArch64::X11},
+ {"__llvm_slsblr_thunk_x12", AArch64::X12},
+ {"__llvm_slsblr_thunk_x13", AArch64::X13},
+ {"__llvm_slsblr_thunk_x14", AArch64::X14},
+ {"__llvm_slsblr_thunk_x15", AArch64::X15},
+ // X16 and X17 are deliberately missing, as the mitigation requires those
+ // register to not be used in BLR. See comment in ConvertBLRToBL for more
+ // details.
+ {"__llvm_slsblr_thunk_x18", AArch64::X18},
+ {"__llvm_slsblr_thunk_x19", AArch64::X19},
+ {"__llvm_slsblr_thunk_x20", AArch64::X20},
+ {"__llvm_slsblr_thunk_x21", AArch64::X21},
+ {"__llvm_slsblr_thunk_x22", AArch64::X22},
+ {"__llvm_slsblr_thunk_x23", AArch64::X23},
+ {"__llvm_slsblr_thunk_x24", AArch64::X24},
+ {"__llvm_slsblr_thunk_x25", AArch64::X25},
+ {"__llvm_slsblr_thunk_x26", AArch64::X26},
+ {"__llvm_slsblr_thunk_x27", AArch64::X27},
+ {"__llvm_slsblr_thunk_x28", AArch64::X28},
+ {"__llvm_slsblr_thunk_x29", AArch64::FP},
+ // X30 is deliberately missing, for similar reasons as X16 and X17 are
+ // missing.
+ {"__llvm_slsblr_thunk_x31", AArch64::XZR},
};
unsigned getThunkIndex(Register Reg) {
``````````
</details>
https://github.com/llvm/llvm-project/pull/97472
More information about the llvm-commits
mailing list