[llvm-branch-commits] [llvm-branch] r168526 - in /llvm/branches/release_32: ./ lib/Target/CppBackend/CPPBackend.cpp

[Pawel Wodnicki]

Author: pawel
Date: Fri Nov 23 13:56:57 2012
New Revision: 168526

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

Update call to the new syntax.

Modified:
    llvm/branches/release_32/   (props changed)
    llvm/branches/release_32/lib/Target/CppBackend/CPPBackend.cpp

Propchange: llvm/branches/release_32/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 23 13:56:57 2012
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,167718-167719,167731,167737,167743,167750,167784,167811,167817,167855,167860-167864,167875,167942,167948,167966,168001,168035,168181,168189,168197-168198,168227,168280,168291,168316,168319,168346,168352,168354,168361,168364
+/llvm/trunk:155241,167718-167719,167731,167737,167743,167750,167784,167811,167817,167855,167860-167864,167875,167942,167948,167966,168001,168035,168181,168189,168197-168198,168227,168280,168291,168316,168319,168346,168352,168354,168361,168364,168512

Modified: llvm/branches/release_32/lib/Target/CppBackend/CPPBackend.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_32/lib/Target/CppBackend/CPPBackend.cpp?rev=168526&r1=168525&r2=168526&view=diff
==============================================================================
--- llvm/branches/release_32/lib/Target/CppBackend/CPPBackend.cpp (original)
+++ llvm/branches/release_32/lib/Target/CppBackend/CPPBackend.cpp Fri Nov 23 13:56:57 2012
@@ -518,7 +518,7 @@
       Out << "Attrs.push_back(PAWI);";
       nl(Out);
     }
-    Out << name << "_PAL = AttrListPtr::get(Attrs);";
+    Out << name << "_PAL = AttrListPtr::get(mod->getContext(), Attrs);";
     nl(Out);
     out(); nl(Out);
     Out << '}'; nl(Out);