[llvm-commits] [dragonegg] r168488 - in /dragonegg/branches/release_32: ./ src/TypeConversion.cpp

[Pawel Wodnicki]

Author: pawel
Date: Thu Nov 22 00:16:20 2012
New Revision: 168488

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

Fix compilation after recent attributes change.

Modified:
    dragonegg/branches/release_32/   (props changed)
    dragonegg/branches/release_32/src/TypeConversion.cpp

Propchange: dragonegg/branches/release_32/
------------------------------------------------------------------------------
    svn:mergeinfo = /dragonegg/trunk:168379

Modified: dragonegg/branches/release_32/src/TypeConversion.cpp
URL: http://llvm.org/viewvc/llvm-project/dragonegg/branches/release_32/src/TypeConversion.cpp?rev=168488&r1=168487&r2=168488&view=diff
==============================================================================
--- dragonegg/branches/release_32/src/TypeConversion.cpp (original)
+++ dragonegg/branches/release_32/src/TypeConversion.cpp Thu Nov 22 00:16:20 2012
@@ -730,7 +730,7 @@
                                                               PAttrBuilder)));
   }
 
-  PAL = AttrListPtr::get(Attrs);
+  PAL = AttrListPtr::get(Context, Attrs);
   return FunctionType::get(RetTy, ArgTys, false);
 }
 
@@ -916,7 +916,7 @@
                                                             FnAttrBuilder)));
 
   // Finally, make the function type and result attributes.
-  PAL = AttrListPtr::get(Attrs);
+  PAL = AttrListPtr::get(Context, Attrs);
   return FunctionType::get(RetTy, ArgTypes, Args == 0);
 }