diff options
| -rw-r--r-- | include/llvm/Attributes.h | 8 | ||||
| -rw-r--r-- | lib/VMCore/Verifier.cpp | 5 |
2 files changed, 4 insertions, 9 deletions
diff --git a/include/llvm/Attributes.h b/include/llvm/Attributes.h index f03e583fa5..dff4819023 100644 --- a/include/llvm/Attributes.h +++ b/include/llvm/Attributes.h @@ -117,14 +117,6 @@ public: /// alignment value. unsigned getStackAlignment() const; - /// \brief Attribute that only apply to function parameters. - bool hasParameterOnlyAttrs() const { - return hasAttribute(Attribute::ByVal) || - hasAttribute(Attribute::Nest) || - hasAttribute(Attribute::StructRet) || - hasAttribute(Attribute::NoCapture); - } - /// \brief Attribute that may be applied to the function itself. These cannot /// be used on return values or function parameters. bool hasFunctionOnlyAttrs() const { diff --git a/lib/VMCore/Verifier.cpp b/lib/VMCore/Verifier.cpp index eaafa68c39..17301872ea 100644 --- a/lib/VMCore/Verifier.cpp +++ b/lib/VMCore/Verifier.cpp @@ -534,7 +534,10 @@ void Verifier::VerifyParameterAttrs(Attribute Attrs, Type *Ty, "' only apply to functions!", V); if (isReturnValue) - Assert1(!Attrs.hasParameterOnlyAttrs(), + Assert1(!Attrs.hasAttribute(Attribute::ByVal) && + !Attrs.hasAttribute(Attribute::Nest) && + !Attrs.hasAttribute(Attribute::StructRet) && + !Attrs.hasAttribute(Attribute::NoCapture), "Attribute 'byval', 'nest', 'sret', and 'nocapture' " "do not apply to return values!", V); |