From 63e9d0e4b7ea9b5c1cba52095d1cc0c92cb7256c Mon Sep 17 00:00:00 2001
From: Amaury Sechet <deadalnix@gmail.com>
Date: Fri, 9 Sep 2016 04:42:49 +0000
Subject: [PATCH] Update clang for D21514. NFC
Summary: As per title.
Reviewers: ahatanak, bkramer, whitequark, mehdi_amini, void
Subscribers: cfe-commits
Differential Revision: http://reviews.llvm.org/D21515
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@281018 91177308-0d34-0410-b5e6-96231b3b80d8
---
lib/CodeGen/CGExpr.cpp | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp
index 89df63d8bf3..5f710f97bd5 100644
--- a/lib/CodeGen/CGExpr.cpp
+++ b/lib/CodeGen/CGExpr.cpp
@@ -2758,10 +2758,11 @@ void CodeGenFunction::EmitTrapCheck(llvm::Value *Checked) {
llvm::CallInst *CodeGenFunction::EmitTrapCall(llvm::Intrinsic::ID IntrID) {
llvm::CallInst *TrapCall = Builder.CreateCall(CGM.getIntrinsic(IntrID));
- if (!CGM.getCodeGenOpts().TrapFuncName.empty())
- TrapCall->addAttribute(llvm::AttributeSet::FunctionIndex,
- "trap-func-name",
- CGM.getCodeGenOpts().TrapFuncName);
+ if (!CGM.getCodeGenOpts().TrapFuncName.empty()) {
+ auto A = llvm::Attribute::get(getLLVMContext(), "trap-func-name",
+ CGM.getCodeGenOpts().TrapFuncName);
+ TrapCall->addAttribute(llvm::AttributeSet::FunctionIndex, A);
+ }
return TrapCall;
}
--
GitLab