[llvm-commits] [dragonegg] r171297 - in /dragonegg/trunk/src: Backend.cpp Convert.cpp TypeConversion.cpp

[Duncan Sands]

Author: baldrick
Date: Mon Dec 31 07:03:36 2012
New Revision: 171297

URL: http://llvm.org/viewvc/llvm-project?rev=171297&view=rev
Log:
Fix the dragonegg build after recent changes to attributes in LLVM.

Modified:
    dragonegg/trunk/src/Backend.cpp
    dragonegg/trunk/src/Convert.cpp
    dragonegg/trunk/src/TypeConversion.cpp

Modified: dragonegg/trunk/src/Backend.cpp
URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/src/Backend.cpp?rev=171297&r1=171296&r2=171297&view=diff
==============================================================================
--- dragonegg/trunk/src/Backend.cpp (original)
+++ dragonegg/trunk/src/Backend.cpp Mon Dec 31 07:03:36 2012
@@ -705,7 +705,8 @@
     // TODO: Consider letting the GCC inliner do this.
     for (Module::iterator I = TheModule->begin(), E = TheModule->end();
          I != E; ++I)
-      if (I->getFnAttributes().hasAttribute(Attribute::AlwaysInline)) {
+      if (I->getAttributes().hasAttribute(AttributeSet::FunctionIndex,
+                                          Attribute::AlwaysInline)) {
         NeedAlwaysInliner = true;
         break;
       }

Modified: dragonegg/trunk/src/Convert.cpp
URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/src/Convert.cpp?rev=171297&r1=171296&r2=171297&view=diff
==============================================================================
--- dragonegg/trunk/src/Convert.cpp (original)
+++ dragonegg/trunk/src/Convert.cpp Mon Dec 31 07:03:36 2012
@@ -3276,7 +3276,8 @@
     PAL = PAL.addAttr(Callee->getContext(), ~0, NoUnwind);
   }
 
-  if (!PAL.getFnAttributes().hasAttribute(Attribute::NoUnwind)) {
+  if (!PAL.hasAttribute(AttributeSet::FunctionIndex,
+                        Attribute::NoUnwind)) {
     // This call may throw.  Determine if we need to generate
     // an invoke rather than a simple call.
     LPadNo = lookup_stmt_eh_lp(stmt);

Modified: dragonegg/trunk/src/TypeConversion.cpp
URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/src/TypeConversion.cpp?rev=171297&r1=171296&r2=171297&view=diff
==============================================================================
--- dragonegg/trunk/src/TypeConversion.cpp (original)
+++ dragonegg/trunk/src/TypeConversion.cpp Mon Dec 31 07:03:36 2012
@@ -886,7 +886,7 @@
 #endif // LLVM_TARGET_ENABLE_REGPARM
 
     if (PAttrBuilder.hasAttributes()) {
-      HasByVal |= PAttrBuilder.hasAttribute(Attribute::ByVal);
+      HasByVal |= PAttrBuilder.contains(Attribute::ByVal);
 
       // If the argument is split into multiple scalars, assign the
       // attributes to all scalars of the aggregate.