llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-backend-aarch64 @llvm/pr-subscribers-backend-x86 @llvm/pr-subscribers-clang Author: None (MagentaTreehouse) <details> <summary>Changes</summary> --- Full diff: https://github.com/llvm/llvm-project/pull/83693.diff 4 Files Affected: - (modified) clang/lib/AST/Interp/ByteCodeEmitter.cpp (+1-4) - (modified) llvm/lib/Target/AArch64/AArch64SLSHardening.cpp (+2-7) - (modified) llvm/lib/Target/ARM/ARMSLSHardening.cpp (+2-7) - (modified) llvm/lib/Target/X86/X86IndirectThunks.cpp (+2-7) ``````````diff diff --git a/clang/lib/AST/Interp/ByteCodeEmitter.cpp b/clang/lib/AST/Interp/ByteCodeEmitter.cpp index e1b954fcc68486..4fbfc0930fbaa1 100644 --- a/clang/lib/AST/Interp/ByteCodeEmitter.cpp +++ b/clang/lib/AST/Interp/ByteCodeEmitter.cpp @@ -302,10 +302,7 @@ bool ByteCodeEmitter::emitOp(Opcode Op, const Tys &... Args, const SourceInfo &S if (SI) SrcMap.emplace_back(Code.size(), SI); - // The initializer list forces the expression to be evaluated - // for each argument in the variadic template, in order. - (void)std::initializer_list<int>{(emit(P, Code, Args, Success), 0)...}; - + (..., emit(P, Code, Args, Success)); return Success; } diff --git a/llvm/lib/Target/AArch64/AArch64SLSHardening.cpp b/llvm/lib/Target/AArch64/AArch64SLSHardening.cpp index 76dd5a2d713ebb..ce3bc0b1837558 100644 --- a/llvm/lib/Target/AArch64/AArch64SLSHardening.cpp +++ b/llvm/lib/Target/AArch64/AArch64SLSHardening.cpp @@ -412,20 +412,15 @@ class AArch64IndirectThunks : public MachineFunctionPass { private: std::tuple<SLSBLRThunkInserter> TIs; - // FIXME: When LLVM moves to C++17, these can become folds template <typename... ThunkInserterT> static void initTIs(Module &M, std::tuple<ThunkInserterT...> &ThunkInserters) { - (void)std::initializer_list<int>{ - (std::get<ThunkInserterT>(ThunkInserters).init(M), 0)...}; + (..., std::get<ThunkInserterT>(ThunkInserters).init(M)); } template <typename... ThunkInserterT> static bool runTIs(MachineModuleInfo &MMI, MachineFunction &MF, std::tuple<ThunkInserterT...> &ThunkInserters) { - bool Modified = false; - (void)std::initializer_list<int>{ - Modified |= std::get<ThunkInserterT>(ThunkInserters).run(MMI, MF)...}; - return Modified; + return (0 | ... | std::get<ThunkInserterT>(ThunkInserters).run(MMI, MF)); } }; diff --git a/llvm/lib/Target/ARM/ARMSLSHardening.cpp b/llvm/lib/Target/ARM/ARMSLSHardening.cpp index 23d72b34902d0e..d9ff14ead60e27 100644 --- a/llvm/lib/Target/ARM/ARMSLSHardening.cpp +++ b/llvm/lib/Target/ARM/ARMSLSHardening.cpp @@ -404,20 +404,15 @@ class ARMIndirectThunks : public MachineFunctionPass { private: std::tuple<SLSBLRThunkInserter> TIs; - // FIXME: When LLVM moves to C++17, these can become folds template <typename... ThunkInserterT> static void initTIs(Module &M, std::tuple<ThunkInserterT...> &ThunkInserters) { - (void)std::initializer_list<int>{ - (std::get<ThunkInserterT>(ThunkInserters).init(M), 0)...}; + (..., std::get<ThunkInserterT>(ThunkInserters).init(M)); } template <typename... ThunkInserterT> static bool runTIs(MachineModuleInfo &MMI, MachineFunction &MF, std::tuple<ThunkInserterT...> &ThunkInserters) { - bool Modified = false; - (void)std::initializer_list<int>{ - Modified |= std::get<ThunkInserterT>(ThunkInserters).run(MMI, MF)...}; - return Modified; + return (0 | ... | std::get<ThunkInserterT>(ThunkInserters).run(MMI, MF)); } }; diff --git a/llvm/lib/Target/X86/X86IndirectThunks.cpp b/llvm/lib/Target/X86/X86IndirectThunks.cpp index 9db667900bffb3..ecc52600f75933 100644 --- a/llvm/lib/Target/X86/X86IndirectThunks.cpp +++ b/llvm/lib/Target/X86/X86IndirectThunks.cpp @@ -118,20 +118,15 @@ class X86IndirectThunks : public MachineFunctionPass { private: std::tuple<RetpolineThunkInserter, LVIThunkInserter> TIs; - // FIXME: When LLVM moves to C++17, these can become folds template <typename... ThunkInserterT> static void initTIs(Module &M, std::tuple<ThunkInserterT...> &ThunkInserters) { - (void)std::initializer_list<int>{ - (std::get<ThunkInserterT>(ThunkInserters).init(M), 0)...}; + (..., std::get<ThunkInserterT>(ThunkInserters).init(M)); } template <typename... ThunkInserterT> static bool runTIs(MachineModuleInfo &MMI, MachineFunction &MF, std::tuple<ThunkInserterT...> &ThunkInserters) { - bool Modified = false; - (void)std::initializer_list<int>{ - Modified |= std::get<ThunkInserterT>(ThunkInserters).run(MMI, MF)...}; - return Modified; + return (0 | ... | std::get<ThunkInserterT>(ThunkInserters).run(MMI, MF)); } }; `````````` </details> https://github.com/llvm/llvm-project/pull/83693 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits