[llvm] r253945 - [DIE] Make DIE.h NDEBUG conditional-free.
Davide Italiano via llvm-commits
llvm-commits at lists.llvm.org
Mon Nov 23 18:21:44 PST 2015
Author: davide
Date: Mon Nov 23 20:21:43 2015
New Revision: 253945
URL: http://llvm.org/viewvc/llvm-project?rev=253945&view=rev
Log:
[DIE] Make DIE.h NDEBUG conditional-free.
Switch dump()/print() method definitions to LLVM_DUMP_METHOD instead.
Modified:
llvm/trunk/include/llvm/CodeGen/DIE.h
llvm/trunk/lib/CodeGen/AsmPrinter/DIE.cpp
Modified: llvm/trunk/include/llvm/CodeGen/DIE.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/DIE.h?rev=253945&r1=253944&r2=253945&view=diff
==============================================================================
--- llvm/trunk/include/llvm/CodeGen/DIE.h (original)
+++ llvm/trunk/include/llvm/CodeGen/DIE.h Mon Nov 23 20:21:43 2015
@@ -100,10 +100,8 @@ public:
///
void Emit(const AsmPrinter *AP) const;
-#ifndef NDEBUG
void print(raw_ostream &O);
void dump();
-#endif
};
//===--------------------------------------------------------------------===//
@@ -143,9 +141,7 @@ public:
void EmitValue(const AsmPrinter *AP, dwarf::Form Form) const;
unsigned SizeOf(const AsmPrinter *AP, dwarf::Form Form) const;
-#ifndef NDEBUG
void print(raw_ostream &O) const;
-#endif
};
//===--------------------------------------------------------------------===//
@@ -164,9 +160,7 @@ public:
void EmitValue(const AsmPrinter *AP, dwarf::Form Form) const;
unsigned SizeOf(const AsmPrinter *AP, dwarf::Form Form) const;
-#ifndef NDEBUG
void print(raw_ostream &O) const;
-#endif
};
//===--------------------------------------------------------------------===//
@@ -185,9 +179,7 @@ public:
void EmitValue(const AsmPrinter *AP, dwarf::Form Form) const;
unsigned SizeOf(const AsmPrinter *AP, dwarf::Form Form) const;
-#ifndef NDEBUG
void print(raw_ostream &O) const;
-#endif
};
//===--------------------------------------------------------------------===//
@@ -203,9 +195,7 @@ public:
void EmitValue(const AsmPrinter *AP, dwarf::Form Form) const;
unsigned SizeOf(const AsmPrinter *AP, dwarf::Form Form) const;
-#ifndef NDEBUG
void print(raw_ostream &O) const;
-#endif
};
//===--------------------------------------------------------------------===//
@@ -223,9 +213,7 @@ public:
void EmitValue(const AsmPrinter *AP, dwarf::Form Form) const;
unsigned SizeOf(const AsmPrinter *AP, dwarf::Form Form) const;
-#ifndef NDEBUG
void print(raw_ostream &O) const;
-#endif
};
//===--------------------------------------------------------------------===//
@@ -252,9 +240,7 @@ public:
: sizeof(int32_t);
}
-#ifndef NDEBUG
void print(raw_ostream &O) const;
-#endif
};
//===--------------------------------------------------------------------===//
@@ -273,9 +259,7 @@ public:
return 8;
}
-#ifndef NDEBUG
void print(raw_ostream &O) const;
-#endif
};
//===--------------------------------------------------------------------===//
@@ -295,9 +279,7 @@ public:
void EmitValue(const AsmPrinter *AP, dwarf::Form Form) const;
unsigned SizeOf(const AsmPrinter *AP, dwarf::Form Form) const;
-#ifndef NDEBUG
void print(raw_ostream &O) const;
-#endif
};
//===--------------------------------------------------------------------===//
@@ -444,10 +426,8 @@ public:
///
unsigned SizeOf(const AsmPrinter *AP) const;
-#ifndef NDEBUG
void print(raw_ostream &O) const;
void dump() const;
-#endif
};
struct IntrusiveBackListNode {
@@ -710,10 +690,8 @@ public:
/// gives \a DIEValue::isNone) if no such attribute exists.
DIEValue findAttribute(dwarf::Attribute Attribute) const;
-#ifndef NDEBUG
void print(raw_ostream &O, unsigned IndentCount = 0) const;
void dump();
-#endif
};
//===--------------------------------------------------------------------===//
@@ -747,9 +725,7 @@ public:
void EmitValue(const AsmPrinter *AP, dwarf::Form Form) const;
unsigned SizeOf(const AsmPrinter *AP, dwarf::Form Form) const;
-#ifndef NDEBUG
void print(raw_ostream &O) const;
-#endif
};
//===--------------------------------------------------------------------===//
@@ -780,9 +756,7 @@ public:
void EmitValue(const AsmPrinter *AP, dwarf::Form Form) const;
unsigned SizeOf(const AsmPrinter *AP, dwarf::Form Form) const;
-#ifndef NDEBUG
void print(raw_ostream &O) const;
-#endif
};
} // end llvm namespace
Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DIE.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DIE.cpp?rev=253945&r1=253944&r2=253945&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DIE.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DIE.cpp Mon Nov 23 20:21:43 2015
@@ -86,7 +86,7 @@ void DIEAbbrev::Emit(const AsmPrinter *A
AP->EmitULEB128(0, "EOM(2)");
}
-#ifndef NDEBUG
+LLVM_DUMP_METHOD
void DIEAbbrev::print(raw_ostream &O) {
O << "Abbreviation @"
<< format("0x%lx", (long)(intptr_t)this)
@@ -104,8 +104,9 @@ void DIEAbbrev::print(raw_ostream &O) {
<< '\n';
}
}
+
+LLVM_DUMP_METHOD
void DIEAbbrev::dump() { print(dbgs()); }
-#endif
DIEAbbrev DIE::generateAbbrev() const {
DIEAbbrev Abbrev(Tag, hasChildren());
@@ -144,7 +145,7 @@ DIEValue DIE::findAttribute(dwarf::Attri
return DIEValue();
}
-#ifndef NDEBUG
+LLVM_DUMP_METHOD
static void printValues(raw_ostream &O, const DIEValueList &Values,
StringRef Type, unsigned Size, unsigned IndentCount) {
O << Type << ": Size: " << Size << "\n";
@@ -160,6 +161,7 @@ static void printValues(raw_ostream &O,
}
}
+LLVM_DUMP_METHOD
void DIE::print(raw_ostream &O, unsigned IndentCount) const {
const std::string Indent(IndentCount, ' ');
O << Indent << "Die: " << format("0x%lx", (long)(intptr_t) this)
@@ -184,10 +186,10 @@ void DIE::print(raw_ostream &O, unsigned
O << "\n";
}
+LLVM_DUMP_METHOD
void DIE::dump() {
print(dbgs());
}
-#endif
void DIEValue::EmitValue(const AsmPrinter *AP) const {
switch (Ty) {
@@ -213,7 +215,7 @@ unsigned DIEValue::SizeOf(const AsmPrint
llvm_unreachable("Unknown DIE kind");
}
-#ifndef NDEBUG
+LLVM_DUMP_METHOD
void DIEValue::print(raw_ostream &O) const {
switch (Ty) {
case isNone:
@@ -226,10 +228,10 @@ void DIEValue::print(raw_ostream &O) con
}
}
+LLVM_DUMP_METHOD
void DIEValue::dump() const {
print(dbgs());
}
-#endif
//===----------------------------------------------------------------------===//
// DIEInteger Implementation
@@ -303,12 +305,11 @@ unsigned DIEInteger::SizeOf(const AsmPri
}
}
-#ifndef NDEBUG
+LLVM_DUMP_METHOD
void DIEInteger::print(raw_ostream &O) const {
O << "Int: " << (int64_t)Integer << " 0x";
O.write_hex(Integer);
}
-#endif
//===----------------------------------------------------------------------===//
// DIEExpr Implementation
@@ -329,9 +330,8 @@ unsigned DIEExpr::SizeOf(const AsmPrinte
return AP->getPointerSize();
}
-#ifndef NDEBUG
+LLVM_DUMP_METHOD
void DIEExpr::print(raw_ostream &O) const { O << "Expr: " << *Expr; }
-#endif
//===----------------------------------------------------------------------===//
// DIELabel Implementation
@@ -355,9 +355,8 @@ unsigned DIELabel::SizeOf(const AsmPrint
return AP->getPointerSize();
}
-#ifndef NDEBUG
+LLVM_DUMP_METHOD
void DIELabel::print(raw_ostream &O) const { O << "Lbl: " << Label->getName(); }
-#endif
//===----------------------------------------------------------------------===//
// DIEDelta Implementation
@@ -378,11 +377,10 @@ unsigned DIEDelta::SizeOf(const AsmPrint
return AP->getPointerSize();
}
-#ifndef NDEBUG
+LLVM_DUMP_METHOD
void DIEDelta::print(raw_ostream &O) const {
O << "Del: " << LabelHi->getName() << "-" << LabelLo->getName();
}
-#endif
//===----------------------------------------------------------------------===//
// DIEString Implementation
@@ -431,11 +429,10 @@ unsigned DIEString::SizeOf(const AsmPrin
return DIEInteger(S.getOffset()).SizeOf(AP, Form);
}
-#ifndef NDEBUG
+LLVM_DUMP_METHOD
void DIEString::print(raw_ostream &O) const {
O << "String: " << S.getString();
}
-#endif
//===----------------------------------------------------------------------===//
// DIEEntry Implementation
@@ -476,11 +473,10 @@ unsigned DIEEntry::getRefAddrSize(const
return sizeof(int32_t);
}
-#ifndef NDEBUG
+LLVM_DUMP_METHOD
void DIEEntry::print(raw_ostream &O) const {
O << format("Die: 0x%lx", (long)(intptr_t)&Entry);
}
-#endif
//===----------------------------------------------------------------------===//
// DIETypeSignature Implementation
@@ -491,11 +487,10 @@ void DIETypeSignature::EmitValue(const A
Asm->OutStreamer->EmitIntValue(Unit->getTypeSignature(), 8);
}
-#ifndef NDEBUG
+LLVM_DUMP_METHOD
void DIETypeSignature::print(raw_ostream &O) const {
O << format("Type Unit: 0x%lx", Unit->getTypeSignature());
}
-#endif
//===----------------------------------------------------------------------===//
// DIELoc Implementation
@@ -543,11 +538,10 @@ unsigned DIELoc::SizeOf(const AsmPrinter
}
}
-#ifndef NDEBUG
+LLVM_DUMP_METHOD
void DIELoc::print(raw_ostream &O) const {
printValues(O, *this, "ExprLoc", Size, 5);
}
-#endif
//===----------------------------------------------------------------------===//
// DIEBlock Implementation
@@ -591,11 +585,10 @@ unsigned DIEBlock::SizeOf(const AsmPrint
}
}
-#ifndef NDEBUG
+LLVM_DUMP_METHOD
void DIEBlock::print(raw_ostream &O) const {
printValues(O, *this, "Blk", Size, 5);
}
-#endif
//===----------------------------------------------------------------------===//
// DIELocList Implementation
@@ -617,6 +610,5 @@ void DIELocList::EmitValue(const AsmPrin
AP->emitDwarfSymbolReference(Label, /*ForceOffset*/ DD->useSplitDwarf());
}
-#ifndef NDEBUG
+LLVM_DUMP_METHOD
void DIELocList::print(raw_ostream &O) const { O << "LocList: " << Index; }
-#endif
More information about the llvm-commits
mailing list