[llvm-branch-commits] [cfe-branch] r168487 - in /cfe/branches/release_32: ./ lib/CodeGen/CGCall.cpp lib/CodeGen/CodeGenModule.cpp

[Pawel Wodnicki]

Author: pawel
Date: Thu Nov 22 00:10:56 2012
New Revision: 168487

URL: http://llvm.org/viewvc/llvm-project?rev=168487&view=rev
Log:
Merging r168355: into the 3.2 release branch.

Update method calls to the new interface re r168354.

Modified:
    cfe/branches/release_32/   (props changed)
    cfe/branches/release_32/lib/CodeGen/CGCall.cpp
    cfe/branches/release_32/lib/CodeGen/CodeGenModule.cpp

Propchange: cfe/branches/release_32/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 22 00:10:56 2012
@@ -1,3 +1,3 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:167749,167762,167780,167788,167790,167813-167814,167868,167884,167920,168024,168063,168124,168297
+/cfe/trunk:167749,167762,167780,167788,167790,167813-167814,167868,167884,167920,168024,168063,168124,168297,168355,168379
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_32/lib/CodeGen/CGCall.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_32/lib/CodeGen/CGCall.cpp?rev=168487&r1=168486&r2=168487&view=diff
==============================================================================
--- cfe/branches/release_32/lib/CodeGen/CGCall.cpp (original)
+++ cfe/branches/release_32/lib/CodeGen/CGCall.cpp Thu Nov 22 00:10:56 2012
@@ -2177,7 +2177,8 @@
   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))

Modified: cfe/branches/release_32/lib/CodeGen/CodeGenModule.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_32/lib/CodeGen/CodeGenModule.cpp?rev=168487&r1=168486&r2=168487&view=diff
==============================================================================
--- cfe/branches/release_32/lib/CodeGen/CodeGenModule.cpp (original)
+++ cfe/branches/release_32/lib/CodeGen/CodeGenModule.cpp Thu Nov 22 00:10:56 2012
@@ -533,7 +533,7 @@
   unsigned CallingConv;
   AttributeListType AttributeList;
   ConstructAttributeList(Info, D, AttributeList, CallingConv);
-  F->setAttributes(llvm::AttrListPtr::get(AttributeList));
+  F->setAttributes(llvm::AttrListPtr::get(getLLVMContext(), AttributeList));
   F->setCallingConv(static_cast<llvm::CallingConv::ID>(CallingConv));
 }
 
@@ -1864,7 +1864,7 @@
     ArgList.clear();
     if (!NewCall->getType()->isVoidTy())
       NewCall->takeName(CI);
-    NewCall->setAttributes(llvm::AttrListPtr::get(AttrVec));
+    NewCall->setAttributes(llvm::AttrListPtr::get(OldFn->getContext(), AttrVec));
     NewCall->setCallingConv(CI->getCallingConv());
 
     // Finally, remove the old call, replacing any uses with the new one.