From bf7961fadebbe48dea02dadf12192bd503a7a1dc Mon Sep 17 00:00:00 2001 From: Huihui Zhang Date: Fri, 12 Jun 2020 08:53:04 -0700 Subject: [PATCH] [NFC] Silence compiler warning [-Wmissing-braces]. llvm/lib/Target/AArch64/AArch64SLSHardening.cpp:146:5: warning: suggest braces around initialization of subobject [-Wmissing-braces] "__llvm_slsblr_thunk_x0", "__llvm_slsblr_thunk_x1", ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ { llvm/lib/Target/AArch64/AArch64SLSHardening.cpp:168:5: warning: suggest braces around initialization of subobject [-Wmissing-braces] AArch64::X0, AArch64::X1, AArch64::X2, AArch64::X3, AArch64::X4, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ { --- llvm/lib/Target/AArch64/AArch64SLSHardening.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/llvm/lib/Target/AArch64/AArch64SLSHardening.cpp b/llvm/lib/Target/AArch64/AArch64SLSHardening.cpp index 9feb7e3..4845639 100644 --- a/llvm/lib/Target/AArch64/AArch64SLSHardening.cpp +++ b/llvm/lib/Target/AArch64/AArch64SLSHardening.cpp @@ -142,7 +142,7 @@ bool AArch64SLSHardening::hardenReturnsAndBRs(MachineBasicBlock &MBB) const { static const char SLSBLRNamePrefix[] = "__llvm_slsblr_thunk_"; -static std::array SLSBLRThunkNames{ +static std::array SLSBLRThunkNames{{ "__llvm_slsblr_thunk_x0", "__llvm_slsblr_thunk_x1", "__llvm_slsblr_thunk_x2", "__llvm_slsblr_thunk_x3", "__llvm_slsblr_thunk_x4", "__llvm_slsblr_thunk_x5", @@ -163,14 +163,14 @@ static std::array SLSBLRThunkNames{ // X30 is deliberately missing, for similar reasons as X16 and X17 are // missing. "__llvm_slsblr_thunk_x31", -}; -static std::array SLSBLRThunkRegs{ +}}; +static std::array SLSBLRThunkRegs{{ AArch64::X0, AArch64::X1, AArch64::X2, AArch64::X3, AArch64::X4, AArch64::X5, AArch64::X6, AArch64::X7, AArch64::X8, AArch64::X9, AArch64::X10, AArch64::X11, AArch64::X12, AArch64::X13, AArch64::X14, AArch64::X15, AArch64::X18, AArch64::X19, AArch64::X20, AArch64::X21, AArch64::X22, AArch64::X23, AArch64::X24, AArch64::X25, AArch64::X26, - AArch64::X27, AArch64::X28, AArch64::FP, AArch64::XZR}; + AArch64::X27, AArch64::X28, AArch64::FP, AArch64::XZR}}; namespace { struct SLSBLRThunkInserter : ThunkInserter { -- 2.7.4