diff options
author | Bill Wendling <isanbard@gmail.com> | 2008-12-16 19:06:48 +0000 |
---|---|---|
committer | Bill Wendling <isanbard@gmail.com> | 2008-12-16 19:06:48 +0000 |
commit | 6fa311c2338391b0f332c062b3140c6df139a949 (patch) | |
tree | 63dc423c8a0f40da76553a2c95d7fba71ec86851 /lib/VMCore/Attributes.cpp | |
parent | 905ff1ebc4f383088e6af6fc37504cd06ba62b57 (diff) | |
download | llvm-6fa311c2338391b0f332c062b3140c6df139a949.tar.gz llvm-6fa311c2338391b0f332c062b3140c6df139a949.tar.bz2 llvm-6fa311c2338391b0f332c062b3140c6df139a949.tar.xz |
Temporarily revert r61019, r61030, and r61040. These were breaking LLVM Release
builds.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@61094 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/VMCore/Attributes.cpp')
-rw-r--r-- | lib/VMCore/Attributes.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/VMCore/Attributes.cpp b/lib/VMCore/Attributes.cpp index dd47814d97..92acc111be 100644 --- a/lib/VMCore/Attributes.cpp +++ b/lib/VMCore/Attributes.cpp @@ -37,8 +37,6 @@ std::string Attribute::getAsString(Attributes Attrs) { Result += "inreg "; if (Attrs & Attribute::NoAlias) Result += "noalias "; - if (Attrs & Attribute::NoCapture) - Result += "nocapture "; if (Attrs & Attribute::StructRet) Result += "sret "; if (Attrs & Attribute::ByVal) @@ -61,11 +59,10 @@ std::string Attribute::getAsString(Attributes Attrs) { Result += "sspreq "; if (Attrs & Attribute::Alignment) { Result += "align "; - Result += utostr(1ull << (((Attrs & Attribute::Alignment)>>16) - 1)); + Result += utostr((Attrs & Attribute::Alignment) >> 16); Result += " "; } // Trim the trailing space. - assert(!Result.empty() && "Unknown attribute!"); Result.erase(Result.end()-1); return Result; } @@ -79,7 +76,7 @@ Attributes Attribute::typeIncompatible(const Type *Ty) { if (!isa<PointerType>(Ty)) // Attributes that only apply to pointers. - Incompatible |= ByVal | Nest | NoAlias | StructRet | NoCapture; + Incompatible |= ByVal | Nest | NoAlias | StructRet; return Incompatible; } |