Revert the command line option patch. However, keep the part that makes this pass on Windows. I.e., we don't emit the target dependent attributes in a comment before the function.

llvm-svn: 180750
This commit is contained in:
Bill Wendling 2013-04-29 23:48:06 +00:00
parent 46c2b6e605
commit 0494597566
2 changed files with 5 additions and 20 deletions

View File

@ -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 Module *M) {
printFunction(I);
// Output all attribute groups.
if (!OldStyleAttrSyntax && !Machine.as_empty()) {
if (!Machine.as_empty()) {
Out << '\n';
writeAllAttributeGroups();
}
@ -1613,7 +1606,7 @@ void AssemblyWriter::printFunction(const Function *F) {
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);
if (!AttrStr.empty())
@ -1677,15 +1670,8 @@ void AssemblyWriter::printFunction(const Function *F) {
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);

View File

@ -851,8 +851,7 @@ unsigned AttributeSet::getStackAlignment(unsigned Index) const {
std::string AttributeSet::getAsString(unsigned Index, bool TargetIndependent,
bool InAttrGrp) const {
AttributeSetNode *ASN = getAttributes(Index);
return ASN ? ASN->getAsString(TargetIndependent, InAttrGrp) :
std::string("");
return ASN ? ASN->getAsString(TargetIndependent, InAttrGrp) : std::string("");
}
/// \brief The attributes for the specified index are returned.