Remove the now dead VarArgsIncompatible variable.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@165496 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/Attributes.h b/include/llvm/Attributes.h
index 11c043765c6122bd3b617c50d05d5e82fdd81d43..2a0fbc0ee13fe74d3365d7c070794b02b9cf0e16 100644 (file)
--- a/include/llvm/Attributes.h
+++ b/include/llvm/Attributes.h
@@ -122,9 +122,6 @@ const AttrConst FunctionOnly = {NoReturn_i | NoUnwind_i | ReadNone_i |
   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 @@ public:
     AddressSafety   = 27   ///< Address safety checking is on.
   };
 private:
-  // Currently, we need less than 64 bits.
   AttributesImpl Attrs;
 
   explicit Attributes(AttributesImpl *A);

diff --git a/lib/VMCore/Verifier.cpp b/lib/VMCore/Verifier.cpp
index b459f7b956d4bc4b765769f0ee212d4f22318e37..6c60745d60f40c07f3716044270e52f707491386 100644 (file)
--- a/lib/VMCore/Verifier.cpp
+++ b/lib/VMCore/Verifier.cpp
@@ -1170,9 +1170,8 @@ void Verifier::VerifyCallSite(CallSite CS) {
 
       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.