From 503365830b1a9734bb02ff4d9bfa5ac9447db5d9 Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Wed, 17 Apr 2013 23:35:59 +0000 Subject: [PATCH] Add an option `-enable-old-style-attr-syntax' to print out function attributes in the "old" style. It's sometimes beneficial to emit a testcase with the old style attribute syntax. Allow someone to do this. llvm-svn: 179735 --- include/llvm/IR/Attributes.h | 3 ++- lib/IR/AsmWriter.cpp | 42 ++++++++++++++++++------------------ lib/IR/AttributeImpl.h | 2 +- lib/IR/Attributes.cpp | 16 +++++++++----- 4 files changed, 35 insertions(+), 28 deletions(-) diff --git a/include/llvm/IR/Attributes.h b/include/llvm/IR/Attributes.h index 074b38779ae..6c014ea1046 100644 --- a/include/llvm/IR/Attributes.h +++ b/include/llvm/IR/Attributes.h @@ -306,7 +306,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 = false, + bool InAttrGrp = false) const; typedef ArrayRef::iterator iterator; diff --git a/lib/IR/AsmWriter.cpp b/lib/IR/AsmWriter.cpp index 7761127d557..6b0bfd59188 100644 --- a/lib/IR/AsmWriter.cpp +++ b/lib/IR/AsmWriter.cpp @@ -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 using namespace llvm; +static cl::opt +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 Module *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 Function *F) { 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, true); if (!AttrStr.empty()) Out << "; Function Attrs: " << AttrStr << '\n'; } @@ -1685,8 +1677,15 @@ void AssemblyWriter::printFunction(const Function *F) { 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, true); + if (!AttrStr.empty()) + Out << ' ' << AttrStr; + } if (F->hasSection()) { Out << " section \""; PrintEscapedString(F->getSection(), Out); @@ -2157,7 +2156,8 @@ void AssemblyWriter::writeAllAttributeGroups() { for (std::vector >::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, false, true) + << " }\n"; } //===----------------------------------------------------------------------===// diff --git a/lib/IR/AttributeImpl.h b/lib/IR/AttributeImpl.h index ad2670dade1..7d34c7264fe 100644 --- a/lib/IR/AttributeImpl.h +++ b/lib/IR/AttributeImpl.h @@ -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::iterator iterator; typedef SmallVectorImpl::const_iterator const_iterator; diff --git a/lib/IR/Attributes.cpp b/lib/IR/Attributes.cpp index 2d828914cdc..b513f7dc84c 100644 --- a/lib/IR/Attributes.cpp +++ b/lib/IR/Attributes.cpp @@ -480,12 +480,17 @@ unsigned AttributeSetNode::getStackAlignment() const { return 0; } -std::string AttributeSetNode::getAsString(bool InAttrGrp) const { +std::string AttributeSetNode::getAsString(bool TargetIndependent, + bool InAttrGrp) const { std::string Str = ""; for (SmallVectorImpl::const_iterator I = AttrList.begin(), E = AttrList.end(); I != E; ) { - Str += I->getAsString(InAttrGrp); - if (++I != E) Str += " "; + if (!TargetIndependent || !I->isStringAttribute()) { + Str += I->getAsString(InAttrGrp); + if (++I != E) Str += " "; + } else { + ++I; + } } return Str; } @@ -841,10 +846,11 @@ unsigned AttributeSet::getStackAlignment(unsigned Index) const { 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.