[llvm] r180574 - revert r179735, it has no testcases, and doesn't really make sense.

[Reid Kleckner]

This breaks the windows tests, so I'm reverting it.

On Thu, Apr 25, 2013 at 1:34 PM, Chris Lattner <sabre at nondot.org> wrote:
> Author: lattner
> Date: Thu Apr 25 15:34:16 2013
> New Revision: 180574
>
> URL: http://llvm.org/viewvc/llvm-project?rev=180574&view=rev
> Log:
> revert r179735, it has no testcases, and doesn't really make sense.
>
> 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=180574&r1=180573&r2=180574&view=diff
> ==============================================================================
> --- llvm/trunk/include/llvm/IR/Attributes.h (original)
> +++ llvm/trunk/include/llvm/IR/Attributes.h Thu Apr 25 15:34:16 2013
> @@ -307,8 +307,7 @@ public:
>    unsigned getStackAlignment(unsigned Index) const;
>
>    /// \brief Return the attributes at the index as a string.
> -  std::string getAsString(unsigned Index, bool TargetIndependent = true,
> -                          bool InAttrGrp = false) const;
> +  std::string getAsString(unsigned Index, 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=180574&r1=180573&r2=180574&view=diff
> ==============================================================================
> --- llvm/trunk/lib/IR/AsmWriter.cpp (original)
> +++ llvm/trunk/lib/IR/AsmWriter.cpp Thu Apr 25 15:34:16 2013
> @@ -33,7 +33,6 @@
>  #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"
> @@ -43,12 +42,6 @@
>  #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() {}
>
> @@ -1385,7 +1378,7 @@ void AssemblyWriter::printModule(const M
>      printFunction(I);
>
>    // Output all attribute groups.
> -  if (!OldStyleAttrSyntax && !Machine.as_empty()) {
> +  if (!Machine.as_empty()) {
>      Out << '\n';
>      writeAllAttributeGroups();
>    }
> @@ -1613,9 +1606,24 @@ void AssemblyWriter::printFunction(const
>      Out << "; Materializable\n";
>
>    const AttributeSet &Attrs = F->getAttributes();
> -  if (!OldStyleAttrSyntax && Attrs.hasAttributes(AttributeSet::FunctionIndex)) {
> +  if (Attrs.hasAttributes(AttributeSet::FunctionIndex)) {
>      AttributeSet AS = Attrs.getFnAttributes();
> -    std::string AttrStr = AS.getAsString(AttributeSet::FunctionIndex, false);
> +    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();
> +      }
> +    }
> +
>      if (!AttrStr.empty())
>        Out << "; Function Attrs: " << AttrStr << '\n';
>    }
> @@ -1677,15 +1685,8 @@ void AssemblyWriter::printFunction(const
>    Out << ')';
>    if (F->hasUnnamedAddr())
>      Out << " unnamed_addr";
> -  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 (Attrs.hasAttributes(AttributeSet::FunctionIndex))
> +    Out << " #" << Machine.getAttributeGroupSlot(Attrs.getFnAttributes());
>    if (F->hasSection()) {
>      Out << " section \"";
>      PrintEscapedString(F->getSection(), Out);
> @@ -2156,8 +2157,7 @@ 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, true)
> -        << " }\n";
> +        << I->first.getAsString(AttributeSet::FunctionIndex, true) << " }\n";
>  }
>
>  //===----------------------------------------------------------------------===//
>
> Modified: llvm/trunk/lib/IR/AttributeImpl.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/AttributeImpl.h?rev=180574&r1=180573&r2=180574&view=diff
> ==============================================================================
> --- llvm/trunk/lib/IR/AttributeImpl.h (original)
> +++ llvm/trunk/lib/IR/AttributeImpl.h Thu Apr 25 15:34:16 2013
> @@ -178,7 +178,7 @@ public:
>
>    unsigned getAlignment() const;
>    unsigned getStackAlignment() const;
> -  std::string getAsString(bool TargetIndependent, bool InAttrGrp) const;
> +  std::string getAsString(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=180574&r1=180573&r2=180574&view=diff
> ==============================================================================
> --- llvm/trunk/lib/IR/Attributes.cpp (original)
> +++ llvm/trunk/lib/IR/Attributes.cpp Thu Apr 25 15:34:16 2013
> @@ -483,16 +483,13 @@ unsigned AttributeSetNode::getStackAlign
>    return 0;
>  }
>
> -std::string AttributeSetNode::getAsString(bool TargetIndependent,
> -                                          bool InAttrGrp) const {
> +std::string AttributeSetNode::getAsString(bool InAttrGrp) const {
>    std::string Str;
>    for (SmallVectorImpl<Attribute>::const_iterator I = AttrList.begin(),
>           E = AttrList.end(); I != E; ++I) {
> -    if (TargetIndependent || !I->isStringAttribute()) {
> -      if (I != AttrList.begin())
> -        Str += ' ';
> -      Str += I->getAsString(InAttrGrp);
> -    }
> +    if (I != AttrList.begin())
> +      Str += ' ';
> +    Str += I->getAsString(InAttrGrp);
>    }
>    return Str;
>  }
> @@ -848,11 +845,10 @@ unsigned AttributeSet::getStackAlignment
>    return ASN ? ASN->getStackAlignment() : 0;
>  }
>
> -std::string AttributeSet::getAsString(unsigned Index, bool TargetIndependent,
> +std::string AttributeSet::getAsString(unsigned Index,
>                                        bool InAttrGrp) const {
>    AttributeSetNode *ASN = getAttributes(Index);
> -  return ASN ? ASN->getAsString(TargetIndependent, InAttrGrp) :
> -    std::string("");
> +  return ASN ? ASN->getAsString(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