[llvm-commits] [llvm] r165496 - in /llvm/trunk: include/llvm/Attributes.h lib/VMCore/Verifier.cpp

[Bill Wendling]

Author: void
Date: Tue Oct  9 04:33:01 2012
New Revision: 165496

URL: http://llvm.org/viewvc/llvm-project?rev=165496&view=rev
Log:
Remove the now dead VarArgsIncompatible variable.

Modified:
    llvm/trunk/include/llvm/Attributes.h
    llvm/trunk/lib/VMCore/Verifier.cpp

Modified: llvm/trunk/include/llvm/Attributes.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Attributes.h?rev=165496&r1=165495&r2=165496&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Attributes.h (original)
+++ llvm/trunk/include/llvm/Attributes.h Tue Oct  9 04:33:01 2012
@@ -122,9 +122,6 @@
   Naked_i | InlineHint_i | StackAlignment_i |
   UWTable_i | NonLazyBind_i | ReturnsTwice_i | AddressSafety_i};
 
-/// @brief Parameter attributes that do not apply to vararg call arguments.
-const AttrConst VarArgsIncompatible = {StructRet_i};
-
 /// @brief Attributes that are mutually incompatible.
 const AttrConst MutuallyIncompatible[5] = {
   {ByVal_i | Nest_i | StructRet_i},
@@ -180,7 +177,6 @@
     AddressSafety   = 27   ///< Address safety checking is on.
   };
 private:
-  // Currently, we need less than 64 bits.
   AttributesImpl Attrs;
 
   explicit Attributes(AttributesImpl *A);

Modified: llvm/trunk/lib/VMCore/Verifier.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Verifier.cpp?rev=165496&r1=165495&r2=165496&view=diff
==============================================================================
--- llvm/trunk/lib/VMCore/Verifier.cpp (original)
+++ llvm/trunk/lib/VMCore/Verifier.cpp Tue Oct  9 04:33:01 2012
@@ -1170,9 +1170,8 @@
 
       VerifyParameterAttrs(Attr, CS.getArgument(Idx-1)->getType(), false, I);
 
-      Attributes VArgI = Attr & Attribute::VarArgsIncompatible;
-      Assert1(!VArgI, "Attribute " + VArgI.getAsString() +
-              " cannot be used for vararg call arguments!", I);
+      Assert1(!Attr.hasIncompatibleWithVarArgsAttrs(),
+              "Attribute 'sret' cannot be used for vararg call arguments!", I);
     }
 
   // Verify that there's no metadata unless it's a direct call to an intrinsic.