diff options
author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-11-24 21:09:32 +0100 |
---|---|---|
committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-11-24 21:09:32 +0100 |
commit | b2dcbac1d82fc2e502848a020ee1544a2626406a (patch) | |
tree | c49b906e0f08d7bd883f021a88c268ebfc8f3b1b /lib/CodeGen/CGCall.cpp | |
parent | 68ee9d9993baa7bc062d255517c5c4b654004bc2 (diff) | |
parent | b5fa2f04f037a5d5caa858daf270f9b7406a7a36 (diff) | |
download | clang-b2dcbac1d82fc2e502848a020ee1544a2626406a.tar.gz clang-b2dcbac1d82fc2e502848a020ee1544a2626406a.tar.bz2 clang-b2dcbac1d82fc2e502848a020ee1544a2626406a.tar.xz |
Merge branch 'release-3.2' into embtk-support-release-3.2
Diffstat (limited to 'lib/CodeGen/CGCall.cpp')
-rw-r--r-- | lib/CodeGen/CGCall.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/CodeGen/CGCall.cpp b/lib/CodeGen/CGCall.cpp index 4fbf7bfdb0..2d1d152894 100644 --- a/lib/CodeGen/CGCall.cpp +++ b/lib/CodeGen/CGCall.cpp @@ -2177,7 +2177,8 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo, unsigned CallingConv; CodeGen::AttributeListType AttributeList; CGM.ConstructAttributeList(CallInfo, TargetDecl, AttributeList, CallingConv); - llvm::AttrListPtr Attrs = llvm::AttrListPtr::get(AttributeList); + llvm::AttrListPtr Attrs = llvm::AttrListPtr::get(getLLVMContext(), + AttributeList); llvm::BasicBlock *InvokeDest = 0; if (!Attrs.getFnAttributes().hasAttribute(llvm::Attributes::NoUnwind)) |