[llvm] r180722 - Revert "revert r179735, it has no testcases, and doesn't really make sense."
David Dean
david_dean at apple.com
Mon Apr 29 15:17:44 PDT 2013
Huge thanks here. This fixed something that I was having a hard time tracking down.
On 29 Apr 2013, at 11:23 AM, Reid Kleckner <reid at kleckner.net> wrote:
> Author: rnk
> Date: Mon Apr 29 13:23:53 2013
> New Revision: 180722
>
> URL: http://llvm.org/viewvc/llvm-project?rev=180722&view=rev
> Log:
> Revert "revert r179735, it has no testcases, and doesn't really make sense."
>
> This un-reverts r179735 and reverts commit r180574.
>
> This fixes assertion failures for me locally and should fix the failures
> on Windows reported widely on llvm-dev. We should check if the bots
> caught this and if so why not.
>
> Modified:
> llvm/trunk/include/llvm/IR/Attributes.h
> llvm/trunk/lib/IR/AsmWriter.cpp
> llvm/trunk/lib/IR/AttributeImpl.h
> llvm/trunk/lib/IR/Attributes.cpp
>
> Modified: llvm/trunk/include/llvm/IR/Attributes.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/Attributes.h?rev=180722&r1=180721&r2=180722&view=diff
> ==============================================================================
> --- llvm/trunk/include/llvm/IR/Attributes.h (original)
> +++ llvm/trunk/include/llvm/IR/Attributes.h Mon Apr 29 13:23:53 2013
> @@ -307,7 +307,8 @@ public:
> unsigned getStackAlignment(unsigned Index) const;
>
> /// \brief Return the attributes at the index as a string.
> - std::string getAsString(unsigned Index, bool InAttrGrp = false) const;
> + std::string getAsString(unsigned Index, bool TargetIndependent = true,
> + bool InAttrGrp = false) const;
>
> typedef ArrayRef<Attribute>::iterator iterator;
>
>
> Modified: llvm/trunk/lib/IR/AsmWriter.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/AsmWriter.cpp?rev=180722&r1=180721&r2=180722&view=diff
> ==============================================================================
> --- llvm/trunk/lib/IR/AsmWriter.cpp (original)
> +++ llvm/trunk/lib/IR/AsmWriter.cpp Mon Apr 29 13:23:53 2013
> @@ -33,6 +33,7 @@
> #include "llvm/IR/TypeFinder.h"
> #include "llvm/IR/ValueSymbolTable.h"
> #include "llvm/Support/CFG.h"
> +#include "llvm/Support/CommandLine.h"
> #include "llvm/Support/Debug.h"
> #include "llvm/Support/Dwarf.h"
> #include "llvm/Support/ErrorHandling.h"
> @@ -42,6 +43,12 @@
> #include <cctype>
> using namespace llvm;
>
> +static cl::opt<bool>
> +OldStyleAttrSyntax("enable-old-style-attr-syntax",
> + cl::desc("Output attributes on functions rather than in attribute groups"),
> + cl::Hidden,
> + cl::init(false));
> +
> // Make virtual table appear in this compilation unit.
> AssemblyAnnotationWriter::~AssemblyAnnotationWriter() {}
>
> @@ -1378,7 +1385,7 @@ void AssemblyWriter::printModule(const M
> printFunction(I);
>
> // Output all attribute groups.
> - if (!Machine.as_empty()) {
> + if (!OldStyleAttrSyntax && !Machine.as_empty()) {
> Out << '\n';
> writeAllAttributeGroups();
> }
> @@ -1606,24 +1613,9 @@ void AssemblyWriter::printFunction(const
> Out << "; Materializable\n";
>
> const AttributeSet &Attrs = F->getAttributes();
> - if (Attrs.hasAttributes(AttributeSet::FunctionIndex)) {
> + if (!OldStyleAttrSyntax && Attrs.hasAttributes(AttributeSet::FunctionIndex)) {
> AttributeSet AS = Attrs.getFnAttributes();
> - std::string AttrStr;
> -
> - unsigned Idx = 0;
> - for (unsigned E = AS.getNumSlots(); Idx != E; ++Idx)
> - if (AS.getSlotIndex(Idx) == AttributeSet::FunctionIndex)
> - break;
> -
> - for (AttributeSet::iterator I = AS.begin(Idx), E = AS.end(Idx);
> - I != E; ++I) {
> - Attribute Attr = *I;
> - if (!Attr.isStringAttribute()) {
> - if (!AttrStr.empty()) AttrStr += ' ';
> - AttrStr += Attr.getAsString();
> - }
> - }
> -
> + std::string AttrStr = AS.getAsString(AttributeSet::FunctionIndex, false);
> if (!AttrStr.empty())
> Out << "; Function Attrs: " << AttrStr << '\n';
> }
> @@ -1685,8 +1677,15 @@ void AssemblyWriter::printFunction(const
> Out << ')';
> if (F->hasUnnamedAddr())
> Out << " unnamed_addr";
> - if (Attrs.hasAttributes(AttributeSet::FunctionIndex))
> - Out << " #" << Machine.getAttributeGroupSlot(Attrs.getFnAttributes());
> + if (!OldStyleAttrSyntax) {
> + if (Attrs.hasAttributes(AttributeSet::FunctionIndex))
> + Out << " #" << Machine.getAttributeGroupSlot(Attrs.getFnAttributes());
> + } else {
> + AttributeSet AS = Attrs.getFnAttributes();
> + std::string AttrStr = AS.getAsString(AttributeSet::FunctionIndex, false);
> + if (!AttrStr.empty())
> + Out << ' ' << AttrStr;
> + }
> if (F->hasSection()) {
> Out << " section \"";
> PrintEscapedString(F->getSection(), Out);
> @@ -2157,7 +2156,8 @@ void AssemblyWriter::writeAllAttributeGr
> for (std::vector<std::pair<AttributeSet, unsigned> >::iterator
> I = asVec.begin(), E = asVec.end(); I != E; ++I)
> Out << "attributes #" << I->second << " = { "
> - << I->first.getAsString(AttributeSet::FunctionIndex, true) << " }\n";
> + << I->first.getAsString(AttributeSet::FunctionIndex, true, true)
> + << " }\n";
> }
>
> //===----------------------------------------------------------------------===//
>
> Modified: llvm/trunk/lib/IR/AttributeImpl.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/AttributeImpl.h?rev=180722&r1=180721&r2=180722&view=diff
> ==============================================================================
> --- llvm/trunk/lib/IR/AttributeImpl.h (original)
> +++ llvm/trunk/lib/IR/AttributeImpl.h Mon Apr 29 13:23:53 2013
> @@ -178,7 +178,7 @@ public:
>
> unsigned getAlignment() const;
> unsigned getStackAlignment() const;
> - std::string getAsString(bool InAttrGrp) const;
> + std::string getAsString(bool TargetIndependent, bool InAttrGrp) const;
>
> typedef SmallVectorImpl<Attribute>::iterator iterator;
> typedef SmallVectorImpl<Attribute>::const_iterator const_iterator;
>
> Modified: llvm/trunk/lib/IR/Attributes.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/Attributes.cpp?rev=180722&r1=180721&r2=180722&view=diff
> ==============================================================================
> --- llvm/trunk/lib/IR/Attributes.cpp (original)
> +++ llvm/trunk/lib/IR/Attributes.cpp Mon Apr 29 13:23:53 2013
> @@ -483,13 +483,16 @@ unsigned AttributeSetNode::getStackAlign
> return 0;
> }
>
> -std::string AttributeSetNode::getAsString(bool InAttrGrp) const {
> +std::string AttributeSetNode::getAsString(bool TargetIndependent,
> + bool InAttrGrp) const {
> std::string Str;
> for (SmallVectorImpl<Attribute>::const_iterator I = AttrList.begin(),
> E = AttrList.end(); I != E; ++I) {
> - if (I != AttrList.begin())
> - Str += ' ';
> - Str += I->getAsString(InAttrGrp);
> + if (TargetIndependent || !I->isStringAttribute()) {
> + if (I != AttrList.begin())
> + Str += ' ';
> + Str += I->getAsString(InAttrGrp);
> + }
> }
> return Str;
> }
> @@ -845,10 +848,11 @@ unsigned AttributeSet::getStackAlignment
> return ASN ? ASN->getStackAlignment() : 0;
> }
>
> -std::string AttributeSet::getAsString(unsigned Index,
> +std::string AttributeSet::getAsString(unsigned Index, bool TargetIndependent,
> bool InAttrGrp) const {
> AttributeSetNode *ASN = getAttributes(Index);
> - return ASN ? ASN->getAsString(InAttrGrp) : std::string("");
> + return ASN ? ASN->getAsString(TargetIndependent, InAttrGrp) :
> + std::string("");
> }
>
> /// \brief The attributes for the specified index are returned.
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
-David
More information about the llvm-commits
mailing list