<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Fri, May 22, 2015 at 6:45 PM, Duncan P. N. Exon Smith <span dir="ltr"><<a href="mailto:dexonsmith@apple.com" target="_blank">dexonsmith@apple.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: dexonsmith<br>
Date: Fri May 22 20:45:07 2015<br>
New Revision: 238084<br>
<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject-3Frev-3D238084-26view-3Drev&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=aAMsxTb733OtEhBU4dx9DCnKjvOM_oy6fjbeFhdpTqU&s=T_Uof9K5oAcWEL1-mz9i4V6V5xXNnUxuYEYMPZVtzSk&e=" target="_blank">http://llvm.org/viewvc/llvm-project?rev=238084&view=rev</a><br>
Log:<br>
AsmPrinter: Remove the vtable-entry from DIEValue<br>
<br>
Remove all virtual functions from `DIEValue`, dropping the vtable<br>
pointer from its layout. Instead, create "impl" functions on the<br>
subclasses, and use the `DIEValue::Type` to implement the dynamic<br>
dispatch.<br>
<br>
This is necessary -- obviously not sufficient -- for passing `DIEValue`s<br>
around by value. However, this change stands on its own: we make tons<br>
of these. I measured a drop in memory usage from 888 MB down to 860 MB,<br>
or around 3.2%.<br>
<br>
(I'm looking at `llc` memory usage on `verify-uselistorder.lto.opt.bc`;<br>
see r236629 for details.)<br>
<br>
Modified:<br>
llvm/trunk/include/llvm/CodeGen/DIE.h<br>
llvm/trunk/lib/CodeGen/AsmPrinter/DIE.cpp<br>
<br>
Modified: llvm/trunk/include/llvm/CodeGen/DIE.h<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_llvm_trunk_include_llvm_CodeGen_DIE.h-3Frev-3D238084-26r1-3D238083-26r2-3D238084-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=aAMsxTb733OtEhBU4dx9DCnKjvOM_oy6fjbeFhdpTqU&s=T2M2NDmtfh37j_plzisKdxmAdkaIxYCTm_YQeNvSO_Q&e=" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/DIE.h?rev=238084&r1=238083&r2=238084&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/CodeGen/DIE.h (original)<br>
+++ llvm/trunk/include/llvm/CodeGen/DIE.h Fri May 22 20:45:07 2015<br>
@@ -200,8 +200,6 @@ public:<br>
/// to DWARF attribute classes.<br>
///<br>
class DIEValue {<br>
- virtual void anchor();<br>
-<br>
public:<br>
enum Type {<br>
isInteger,<br>
@@ -222,7 +220,7 @@ protected:<br>
Type Ty;<br>
<br>
explicit DIEValue(Type T) : Ty(T) {}<br>
- virtual ~DIEValue() {}<br>
+ ~DIEValue() {}<br></blockquote><div><br>= default? (I suppose eventually this will go away, once there are no derived types and it's all passed around by value?)<br> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
public:<br>
// Accessors<br>
@@ -230,14 +228,14 @@ public:<br>
<br>
/// EmitValue - Emit value via the Dwarf writer.<br>
///<br>
- virtual void EmitValue(const AsmPrinter *AP, dwarf::Form Form) const = 0;<br>
+ void EmitValue(const AsmPrinter *AP, dwarf::Form Form) const;<br>
<br>
/// SizeOf - Return the size of a value in bytes.<br>
///<br>
- virtual unsigned SizeOf(const AsmPrinter *AP, dwarf::Form Form) const = 0;<br>
+ unsigned SizeOf(const AsmPrinter *AP, dwarf::Form Form) const;<br>
<br>
#ifndef NDEBUG<br>
- virtual void print(raw_ostream &O) const = 0;<br>
+ void print(raw_ostream &O) const;<br>
void dump() const;<br>
#endif<br>
};<br>
@@ -246,6 +244,8 @@ public:<br>
/// DIEInteger - An integer value DIE.<br>
///<br>
class DIEInteger : public DIEValue {<br>
+ friend DIEValue;<br>
+<br>
uint64_t Integer;<br>
<br>
public:<br>
@@ -273,22 +273,18 @@ public:<br>
return dwarf::DW_FORM_data8;<br>
}<br>
<br>
- /// EmitValue - Emit integer of appropriate size.<br>
- ///<br>
- void EmitValue(const AsmPrinter *AP, dwarf::Form Form) const override;<br>
-<br>
uint64_t getValue() const { return Integer; }<br>
void setValue(uint64_t Val) { Integer = Val; }<br>
<br>
- /// SizeOf - Determine size of integer value in bytes.<br>
- ///<br>
- unsigned SizeOf(const AsmPrinter *AP, dwarf::Form Form) const override;<br>
-<br>
// Implement isa/cast/dyncast.<br>
static bool classof(const DIEValue *I) { return I->getType() == isInteger; }<br>
<br>
+private:<br>
+ void EmitValueImpl(const AsmPrinter *AP, dwarf::Form Form) const;<br>
+ unsigned SizeOfImpl(const AsmPrinter *AP, dwarf::Form Form) const;<br>
+<br>
#ifndef NDEBUG<br>
- void print(raw_ostream &O) const override;<br>
+ void printImpl(raw_ostream &O) const;<br>
#endif<br>
};<br>
<br>
@@ -296,28 +292,26 @@ public:<br>
/// DIEExpr - An expression DIE.<br>
//<br>
class DIEExpr : public DIEValue {<br>
+ friend class DIEValue;<br>
+<br>
const MCExpr *Expr;<br>
<br>
public:<br>
explicit DIEExpr(const MCExpr *E) : DIEValue(isExpr), Expr(E) {}<br>
<br>
- /// EmitValue - Emit expression value.<br>
- ///<br>
- void EmitValue(const AsmPrinter *AP, dwarf::Form Form) const override;<br>
-<br>
/// getValue - Get MCExpr.<br>
///<br>
const MCExpr *getValue() const { return Expr; }<br>
<br>
- /// SizeOf - Determine size of expression value in bytes.<br>
- ///<br>
- unsigned SizeOf(const AsmPrinter *AP, dwarf::Form Form) const override;<br>
-<br>
// Implement isa/cast/dyncast.<br>
static bool classof(const DIEValue *E) { return E->getType() == isExpr; }<br>
<br>
+private:<br>
+ void EmitValueImpl(const AsmPrinter *AP, dwarf::Form Form) const;<br>
+ unsigned SizeOfImpl(const AsmPrinter *AP, dwarf::Form Form) const;<br>
+<br>
#ifndef NDEBUG<br>
- void print(raw_ostream &O) const override;<br>
+ void printImpl(raw_ostream &O) const;<br>
#endif<br>
};<br>
<br>
@@ -325,28 +319,26 @@ public:<br>
/// DIELabel - A label DIE.<br>
//<br>
class DIELabel : public DIEValue {<br>
+ friend class DIEValue;<br>
+<br>
const MCSymbol *Label;<br>
<br>
public:<br>
explicit DIELabel(const MCSymbol *L) : DIEValue(isLabel), Label(L) {}<br>
<br>
- /// EmitValue - Emit label value.<br>
- ///<br>
- void EmitValue(const AsmPrinter *AP, dwarf::Form Form) const override;<br>
-<br>
/// getValue - Get MCSymbol.<br>
///<br>
const MCSymbol *getValue() const { return Label; }<br>
<br>
- /// SizeOf - Determine size of label value in bytes.<br>
- ///<br>
- unsigned SizeOf(const AsmPrinter *AP, dwarf::Form Form) const override;<br>
-<br>
// Implement isa/cast/dyncast.<br>
static bool classof(const DIEValue *L) { return L->getType() == isLabel; }<br>
<br>
+private:<br>
+ void EmitValueImpl(const AsmPrinter *AP, dwarf::Form Form) const;<br>
+ unsigned SizeOfImpl(const AsmPrinter *AP, dwarf::Form Form) const;<br>
+<br>
#ifndef NDEBUG<br>
- void print(raw_ostream &O) const override;<br>
+ void printImpl(raw_ostream &O) const;<br>
#endif<br>
};<br>
<br>
@@ -354,6 +346,8 @@ public:<br>
/// DIEDelta - A simple label difference DIE.<br>
///<br>
class DIEDelta : public DIEValue {<br>
+ friend class DIEValue;<br>
+<br>
const MCSymbol *LabelHi;<br>
const MCSymbol *LabelLo;<br>
<br>
@@ -361,19 +355,15 @@ public:<br>
DIEDelta(const MCSymbol *Hi, const MCSymbol *Lo)<br>
: DIEValue(isDelta), LabelHi(Hi), LabelLo(Lo) {}<br>
<br>
- /// EmitValue - Emit delta value.<br>
- ///<br>
- void EmitValue(const AsmPrinter *AP, dwarf::Form Form) const override;<br>
-<br>
- /// SizeOf - Determine size of delta value in bytes.<br>
- ///<br>
- unsigned SizeOf(const AsmPrinter *AP, dwarf::Form Form) const override;<br>
-<br>
// Implement isa/cast/dyncast.<br>
static bool classof(const DIEValue *D) { return D->getType() == isDelta; }<br>
<br>
+private:<br>
+ void EmitValueImpl(const AsmPrinter *AP, dwarf::Form Form) const;<br>
+ unsigned SizeOfImpl(const AsmPrinter *AP, dwarf::Form Form) const;<br>
+<br>
#ifndef NDEBUG<br>
- void print(raw_ostream &O) const override;<br>
+ void printImpl(raw_ostream &O) const;<br>
#endif<br>
};<br>
<br>
@@ -381,6 +371,8 @@ public:<br>
/// DIEString - A container for string values.<br>
///<br>
class DIEString : public DIEValue {<br>
+ friend class DIEValue;<br>
+<br>
const DIEValue *Access;<br>
StringRef Str;<br>
<br>
@@ -391,19 +383,15 @@ public:<br>
/// getString - Grab the string out of the object.<br>
StringRef getString() const { return Str; }<br>
<br>
- /// EmitValue - Emit delta value.<br>
- ///<br>
- void EmitValue(const AsmPrinter *AP, dwarf::Form Form) const override;<br>
-<br>
- /// SizeOf - Determine size of delta value in bytes.<br>
- ///<br>
- unsigned SizeOf(const AsmPrinter *AP, dwarf::Form Form) const override;<br>
-<br>
// Implement isa/cast/dyncast.<br>
static bool classof(const DIEValue *D) { return D->getType() == isString; }<br>
<br>
+private:<br>
+ void EmitValueImpl(const AsmPrinter *AP, dwarf::Form Form) const;<br>
+ unsigned SizeOfImpl(const AsmPrinter *AP, dwarf::Form Form) const;<br>
+<br>
#ifndef NDEBUG<br>
- void print(raw_ostream &O) const override;<br>
+ void printImpl(raw_ostream &O) const;<br>
#endif<br>
};<br>
<br>
@@ -412,6 +400,8 @@ public:<br>
/// this class can also be used as a proxy for a debug information entry not<br>
/// yet defined (ie. types.)<br>
class DIEEntry : public DIEValue {<br>
+ friend class DIEValue;<br>
+<br>
DIE &Entry;<br>
<br>
public:<br>
@@ -420,52 +410,49 @@ public:<br>
<br>
DIE &getEntry() const { return Entry; }<br>
<br>
- /// EmitValue - Emit debug information entry offset.<br>
- ///<br>
- void EmitValue(const AsmPrinter *AP, dwarf::Form Form) const override;<br>
-<br>
- /// SizeOf - Determine size of debug information entry in bytes.<br>
- ///<br>
- unsigned SizeOf(const AsmPrinter *AP, dwarf::Form Form) const override {<br>
- return Form == dwarf::DW_FORM_ref_addr ? getRefAddrSize(AP)<br>
- : sizeof(int32_t);<br>
- }<br>
-<br>
/// Returns size of a ref_addr entry.<br>
static unsigned getRefAddrSize(const AsmPrinter *AP);<br>
<br>
// Implement isa/cast/dyncast.<br>
static bool classof(const DIEValue *E) { return E->getType() == isEntry; }<br>
<br>
+private:<br>
+ void EmitValueImpl(const AsmPrinter *AP, dwarf::Form Form) const;<br>
+ unsigned SizeOfImpl(const AsmPrinter *AP, dwarf::Form Form) const {<br>
+ return Form == dwarf::DW_FORM_ref_addr ? getRefAddrSize(AP)<br>
+ : sizeof(int32_t);<br>
+ }<br>
+<br>
#ifndef NDEBUG<br>
- void print(raw_ostream &O) const override;<br>
+ void printImpl(raw_ostream &O) const;<br>
#endif<br>
};<br>
<br>
//===--------------------------------------------------------------------===//<br>
/// \brief A signature reference to a type unit.<br>
class DIETypeSignature : public DIEValue {<br>
+ friend class DIEValue;<br>
+<br>
const DwarfTypeUnit &Unit;<br>
<br>
public:<br>
explicit DIETypeSignature(const DwarfTypeUnit &Unit)<br>
: DIEValue(isTypeSignature), Unit(Unit) {}<br>
<br>
- /// \brief Emit type unit signature.<br>
- void EmitValue(const AsmPrinter *Asm, dwarf::Form Form) const override;<br>
+ // \brief Implement isa/cast/dyncast.<br>
+ static bool classof(const DIEValue *E) {<br>
+ return E->getType() == isTypeSignature;<br>
+ }<br>
<br>
- /// Returns size of a ref_sig8 entry.<br>
- unsigned SizeOf(const AsmPrinter *AP, dwarf::Form Form) const override {<br>
+private:<br>
+ void EmitValueImpl(const AsmPrinter *AP, dwarf::Form Form) const;<br>
+ unsigned SizeOfImpl(const AsmPrinter *AP, dwarf::Form Form) const {<br>
assert(Form == dwarf::DW_FORM_ref_sig8);<br>
return 8;<br>
}<br>
<br>
- // \brief Implement isa/cast/dyncast.<br>
- static bool classof(const DIEValue *E) {<br>
- return E->getType() == isTypeSignature;<br>
- }<br>
#ifndef NDEBUG<br>
- void print(raw_ostream &O) const override;<br>
+ void printImpl(raw_ostream &O) const;<br>
#endif<br>
};<br>
<br>
@@ -473,6 +460,8 @@ public:<br>
/// DIELoc - Represents an expression location.<br>
//<br>
class DIELoc : public DIEValue, public DIE {<br>
+ friend class DIEValue;<br>
+<br>
mutable unsigned Size; // Size in bytes excluding size header.<br>
public:<br>
DIELoc() : DIEValue(isLoc), Size(0) {}<br>
@@ -496,19 +485,15 @@ public:<br>
return dwarf::DW_FORM_block;<br>
}<br>
<br>
- /// EmitValue - Emit location data.<br>
- ///<br>
- void EmitValue(const AsmPrinter *AP, dwarf::Form Form) const override;<br>
-<br>
- /// SizeOf - Determine size of location data in bytes.<br>
- ///<br>
- unsigned SizeOf(const AsmPrinter *AP, dwarf::Form Form) const override;<br>
-<br>
// Implement isa/cast/dyncast.<br>
static bool classof(const DIEValue *E) { return E->getType() == isLoc; }<br>
<br>
+private:<br>
+ void EmitValueImpl(const AsmPrinter *AP, dwarf::Form Form) const;<br>
+ unsigned SizeOfImpl(const AsmPrinter *AP, dwarf::Form Form) const;<br>
+<br>
#ifndef NDEBUG<br>
- void print(raw_ostream &O) const override;<br>
+ void printImpl(raw_ostream &O) const;<br>
#endif<br>
};<br>
<br>
@@ -516,6 +501,8 @@ public:<br>
/// DIEBlock - Represents a block of values.<br>
//<br>
class DIEBlock : public DIEValue, public DIE {<br>
+ friend class DIEValue;<br>
+<br>
mutable unsigned Size; // Size in bytes excluding size header.<br>
public:<br>
DIEBlock() : DIEValue(isBlock), Size(0) {}<br>
@@ -536,19 +523,15 @@ public:<br>
return dwarf::DW_FORM_block;<br>
}<br>
<br>
- /// EmitValue - Emit location data.<br>
- ///<br>
- void EmitValue(const AsmPrinter *AP, dwarf::Form Form) const override;<br>
-<br>
- /// SizeOf - Determine size of location data in bytes.<br>
- ///<br>
- unsigned SizeOf(const AsmPrinter *AP, dwarf::Form Form) const override;<br>
-<br>
// Implement isa/cast/dyncast.<br>
static bool classof(const DIEValue *E) { return E->getType() == isBlock; }<br>
<br>
+private:<br>
+ void EmitValueImpl(const AsmPrinter *AP, dwarf::Form Form) const;<br>
+ unsigned SizeOfImpl(const AsmPrinter *AP, dwarf::Form Form) const;<br>
+<br>
#ifndef NDEBUG<br>
- void print(raw_ostream &O) const override;<br>
+ void printImpl(raw_ostream &O) const;<br>
#endif<br>
};<br>
<br>
@@ -557,6 +540,8 @@ public:<br>
/// section.<br>
//<br>
class DIELocList : public DIEValue {<br>
+ friend class DIEValue;<br>
+<br>
// Index into the .debug_loc vector.<br>
size_t Index;<br>
<br>
@@ -566,19 +551,15 @@ public:<br>
/// getValue - Grab the current index out.<br>
size_t getValue() const { return Index; }<br>
<br>
- /// EmitValue - Emit location data.<br>
- ///<br>
- void EmitValue(const AsmPrinter *AP, dwarf::Form Form) const override;<br>
-<br>
- /// SizeOf - Determine size of location data in bytes.<br>
- ///<br>
- unsigned SizeOf(const AsmPrinter *AP, dwarf::Form Form) const override;<br>
-<br>
// Implement isa/cast/dyncast.<br>
static bool classof(const DIEValue *E) { return E->getType() == isLocList; }<br>
<br>
+private:<br>
+ void EmitValueImpl(const AsmPrinter *AP, dwarf::Form Form) const;<br>
+ unsigned SizeOfImpl(const AsmPrinter *AP, dwarf::Form Form) const;<br>
+<br>
#ifndef NDEBUG<br>
- void print(raw_ostream &O) const override;<br>
+ void printImpl(raw_ostream &O) const;<br>
#endif<br>
};<br>
<br>
<br>
Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DIE.cpp<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_llvm_trunk_lib_CodeGen_AsmPrinter_DIE.cpp-3Frev-3D238084-26r1-3D238083-26r2-3D238084-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=aAMsxTb733OtEhBU4dx9DCnKjvOM_oy6fjbeFhdpTqU&s=FqSvcpQ-FJeZJU-VT9el3hqGS16v3c99XhmzOb4ZJuM&e=" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DIE.cpp?rev=238084&r1=238083&r2=238084&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/CodeGen/AsmPrinter/DIE.cpp (original)<br>
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DIE.cpp Fri May 22 20:45:07 2015<br>
@@ -191,9 +191,66 @@ void DIE::dump() {<br>
}<br>
#endif<br>
<br>
-void DIEValue::anchor() { }<br>
+void DIEValue::EmitValue(const AsmPrinter *AP, dwarf::Form Form) const {<br>
+ switch (Ty) {<br>
+#define EMIT_VALUE_IMPL(Kind) \<br>
+ case is##Kind: \<br>
+ cast<DIE##Kind>(this)->EmitValueImpl(AP, Form); \<br>
+ break;<br>
+ EMIT_VALUE_IMPL(Integer)<br>
+ EMIT_VALUE_IMPL(String)<br>
+ EMIT_VALUE_IMPL(Expr)<br>
+ EMIT_VALUE_IMPL(Label)<br>
+ EMIT_VALUE_IMPL(Delta)<br>
+ EMIT_VALUE_IMPL(Entry)<br>
+ EMIT_VALUE_IMPL(TypeSignature)<br>
+ EMIT_VALUE_IMPL(Block)<br>
+ EMIT_VALUE_IMPL(Loc)<br>
+ EMIT_VALUE_IMPL(LocList)<br></blockquote><div><br>Worth (now, or in the planned future) having a .def file for these so the list doesn't have to be repeated?<br> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+#undef EMIT_VALUE_IMPL<br>
+ }<br>
+}<br>
+<br>
+unsigned DIEValue::SizeOf(const AsmPrinter *AP, dwarf::Form Form) const {<br>
+ switch (Ty) {<br>
+#define SIZE_OF_IMPL(Kind) \<br>
+ case is##Kind: \<br>
+ return cast<DIE##Kind>(this)->SizeOfImpl(AP, Form);<br>
+ SIZE_OF_IMPL(Integer)<br>
+ SIZE_OF_IMPL(String)<br>
+ SIZE_OF_IMPL(Expr)<br>
+ SIZE_OF_IMPL(Label)<br>
+ SIZE_OF_IMPL(Delta)<br>
+ SIZE_OF_IMPL(Entry)<br>
+ SIZE_OF_IMPL(TypeSignature)<br>
+ SIZE_OF_IMPL(Block)<br>
+ SIZE_OF_IMPL(Loc)<br>
+ SIZE_OF_IMPL(LocList)<br>
+#undef SIZE_OF_IMPL<br>
+ }<br>
+}<br>
<br>
#ifndef NDEBUG<br>
+void DIEValue::print(raw_ostream &O) const {<br>
+ switch (Ty) {<br>
+#define PRINT_IMPL(Kind) \<br>
+ case is##Kind: \<br>
+ cast<DIE##Kind>(this)->printImpl(O); \<br>
+ break;<br>
+ PRINT_IMPL(Integer)<br>
+ PRINT_IMPL(String)<br>
+ PRINT_IMPL(Expr)<br>
+ PRINT_IMPL(Label)<br>
+ PRINT_IMPL(Delta)<br>
+ PRINT_IMPL(Entry)<br>
+ PRINT_IMPL(TypeSignature)<br>
+ PRINT_IMPL(Block)<br>
+ PRINT_IMPL(Loc)<br>
+ PRINT_IMPL(LocList)<br>
+#undef PRINT_IMPL<br>
+ }<br>
+}<br>
+<br>
void DIEValue::dump() const {<br>
print(dbgs());<br>
}<br>
@@ -205,7 +262,7 @@ void DIEValue::dump() const {<br>
<br>
/// EmitValue - Emit integer of appropriate size.<br>
///<br>
-void DIEInteger::EmitValue(const AsmPrinter *Asm, dwarf::Form Form) const {<br>
+void DIEInteger::EmitValueImpl(const AsmPrinter *Asm, dwarf::Form Form) const {<br>
unsigned Size = ~0U;<br>
switch (Form) {<br>
case dwarf::DW_FORM_flag_present:<br>
@@ -241,7 +298,7 @@ void DIEInteger::EmitValue(const AsmPrin<br>
<br>
/// SizeOf - Determine size of integer value in bytes.<br>
///<br>
-unsigned DIEInteger::SizeOf(const AsmPrinter *AP, dwarf::Form Form) const {<br>
+unsigned DIEInteger::SizeOfImpl(const AsmPrinter *AP, dwarf::Form Form) const {<br>
switch (Form) {<br>
case dwarf::DW_FORM_flag_present: return 0;<br>
case dwarf::DW_FORM_flag: // Fall thru<br>
@@ -270,7 +327,7 @@ unsigned DIEInteger::SizeOf(const AsmPri<br>
}<br>
<br>
#ifndef NDEBUG<br>
-void DIEInteger::print(raw_ostream &O) const {<br>
+void DIEInteger::printImpl(raw_ostream &O) const {<br>
O << "Int: " << (int64_t)Integer << " 0x";<br>
O.write_hex(Integer);<br>
}<br>
@@ -282,13 +339,13 @@ void DIEInteger::print(raw_ostream &O) c<br>
<br>
/// EmitValue - Emit expression value.<br>
///<br>
-void DIEExpr::EmitValue(const AsmPrinter *AP, dwarf::Form Form) const {<br>
+void DIEExpr::EmitValueImpl(const AsmPrinter *AP, dwarf::Form Form) const {<br>
AP->OutStreamer->EmitValue(Expr, SizeOf(AP, Form));<br>
}<br>
<br>
/// SizeOf - Determine size of expression value in bytes.<br>
///<br>
-unsigned DIEExpr::SizeOf(const AsmPrinter *AP, dwarf::Form Form) const {<br>
+unsigned DIEExpr::SizeOfImpl(const AsmPrinter *AP, dwarf::Form Form) const {<br>
if (Form == dwarf::DW_FORM_data4) return 4;<br>
if (Form == dwarf::DW_FORM_sec_offset) return 4;<br>
if (Form == dwarf::DW_FORM_strp) return 4;<br>
@@ -296,7 +353,7 @@ unsigned DIEExpr::SizeOf(const AsmPrinte<br>
}<br>
<br>
#ifndef NDEBUG<br>
-void DIEExpr::print(raw_ostream &O) const {<br>
+void DIEExpr::printImpl(raw_ostream &O) const {<br>
O << "Expr: ";<br>
Expr->print(O);<br>
}<br>
@@ -308,7 +365,7 @@ void DIEExpr::print(raw_ostream &O) cons<br>
<br>
/// EmitValue - Emit label value.<br>
///<br>
-void DIELabel::EmitValue(const AsmPrinter *AP, dwarf::Form Form) const {<br>
+void DIELabel::EmitValueImpl(const AsmPrinter *AP, dwarf::Form Form) const {<br>
AP->EmitLabelReference(Label, SizeOf(AP, Form),<br>
Form == dwarf::DW_FORM_strp ||<br>
Form == dwarf::DW_FORM_sec_offset ||<br>
@@ -317,7 +374,7 @@ void DIELabel::EmitValue(const AsmPrinte<br>
<br>
/// SizeOf - Determine size of label value in bytes.<br>
///<br>
-unsigned DIELabel::SizeOf(const AsmPrinter *AP, dwarf::Form Form) const {<br>
+unsigned DIELabel::SizeOfImpl(const AsmPrinter *AP, dwarf::Form Form) const {<br>
if (Form == dwarf::DW_FORM_data4) return 4;<br>
if (Form == dwarf::DW_FORM_sec_offset) return 4;<br>
if (Form == dwarf::DW_FORM_strp) return 4;<br>
@@ -325,7 +382,7 @@ unsigned DIELabel::SizeOf(const AsmPrint<br>
}<br>
<br>
#ifndef NDEBUG<br>
-void DIELabel::print(raw_ostream &O) const {<br>
+void DIELabel::printImpl(raw_ostream &O) const {<br>
O << "Lbl: " << Label->getName();<br>
}<br>
#endif<br>
@@ -336,13 +393,13 @@ void DIELabel::print(raw_ostream &O) con<br>
<br>
/// EmitValue - Emit delta value.<br>
///<br>
-void DIEDelta::EmitValue(const AsmPrinter *AP, dwarf::Form Form) const {<br>
+void DIEDelta::EmitValueImpl(const AsmPrinter *AP, dwarf::Form Form) const {<br>
AP->EmitLabelDifference(LabelHi, LabelLo, SizeOf(AP, Form));<br>
}<br>
<br>
/// SizeOf - Determine size of delta value in bytes.<br>
///<br>
-unsigned DIEDelta::SizeOf(const AsmPrinter *AP, dwarf::Form Form) const {<br>
+unsigned DIEDelta::SizeOfImpl(const AsmPrinter *AP, dwarf::Form Form) const {<br>
if (Form == dwarf::DW_FORM_data4) return 4;<br>
if (Form == dwarf::DW_FORM_sec_offset) return 4;<br>
if (Form == dwarf::DW_FORM_strp) return 4;<br>
@@ -350,7 +407,7 @@ unsigned DIEDelta::SizeOf(const AsmPrint<br>
}<br>
<br>
#ifndef NDEBUG<br>
-void DIEDelta::print(raw_ostream &O) const {<br>
+void DIEDelta::printImpl(raw_ostream &O) const {<br>
O << "Del: " << LabelHi->getName() << "-" << LabelLo->getName();<br>
}<br>
#endif<br>
@@ -361,18 +418,18 @@ void DIEDelta::print(raw_ostream &O) con<br>
<br>
/// EmitValue - Emit string value.<br>
///<br>
-void DIEString::EmitValue(const AsmPrinter *AP, dwarf::Form Form) const {<br>
+void DIEString::EmitValueImpl(const AsmPrinter *AP, dwarf::Form Form) const {<br>
Access->EmitValue(AP, Form);<br>
}<br>
<br>
/// SizeOf - Determine size of delta value in bytes.<br>
///<br>
-unsigned DIEString::SizeOf(const AsmPrinter *AP, dwarf::Form Form) const {<br>
+unsigned DIEString::SizeOfImpl(const AsmPrinter *AP, dwarf::Form Form) const {<br>
return Access->SizeOf(AP, Form);<br>
}<br>
<br>
#ifndef NDEBUG<br>
-void DIEString::print(raw_ostream &O) const {<br>
+void DIEString::printImpl(raw_ostream &O) const {<br>
O << "String: " << Str << "\tSymbol: ";<br>
Access->print(O);<br>
}<br>
@@ -384,7 +441,7 @@ void DIEString::print(raw_ostream &O) co<br>
<br>
/// EmitValue - Emit debug information entry offset.<br>
///<br>
-void DIEEntry::EmitValue(const AsmPrinter *AP, dwarf::Form Form) const {<br>
+void DIEEntry::EmitValueImpl(const AsmPrinter *AP, dwarf::Form Form) const {<br>
<br>
if (Form == dwarf::DW_FORM_ref_addr) {<br>
const DwarfDebug *DD = AP->getDwarfDebug();<br>
@@ -418,7 +475,7 @@ unsigned DIEEntry::getRefAddrSize(const<br>
}<br>
<br>
#ifndef NDEBUG<br>
-void DIEEntry::print(raw_ostream &O) const {<br>
+void DIEEntry::printImpl(raw_ostream &O) const {<br>
O << format("Die: 0x%lx", (long)(intptr_t)&Entry);<br>
}<br>
#endif<br>
@@ -426,13 +483,13 @@ void DIEEntry::print(raw_ostream &O) con<br>
//===----------------------------------------------------------------------===//<br>
// DIETypeSignature Implementation<br>
//===----------------------------------------------------------------------===//<br>
-void DIETypeSignature::EmitValue(const AsmPrinter *Asm, dwarf::Form Form) const {<br>
+void DIETypeSignature::EmitValueImpl(const AsmPrinter *Asm, dwarf::Form Form) const {<br>
assert(Form == dwarf::DW_FORM_ref_sig8);<br>
Asm->OutStreamer->EmitIntValue(Unit.getTypeSignature(), 8);<br>
}<br>
<br>
#ifndef NDEBUG<br>
-void DIETypeSignature::print(raw_ostream &O) const {<br>
+void DIETypeSignature::printImpl(raw_ostream &O) const {<br>
O << format("Type Unit: 0x%lx", Unit.getTypeSignature());<br>
}<br>
#endif<br>
@@ -455,7 +512,7 @@ unsigned DIELoc::ComputeSize(const AsmPr<br>
<br>
/// EmitValue - Emit location data.<br>
///<br>
-void DIELoc::EmitValue(const AsmPrinter *Asm, dwarf::Form Form) const {<br>
+void DIELoc::EmitValueImpl(const AsmPrinter *Asm, dwarf::Form Form) const {<br>
switch (Form) {<br>
default: llvm_unreachable("Improper form for block");<br>
case dwarf::DW_FORM_block1: Asm->EmitInt8(Size); break;<br>
@@ -473,7 +530,7 @@ void DIELoc::EmitValue(const AsmPrinter<br>
<br>
/// SizeOf - Determine size of location data in bytes.<br>
///<br>
-unsigned DIELoc::SizeOf(const AsmPrinter *AP, dwarf::Form Form) const {<br>
+unsigned DIELoc::SizeOfImpl(const AsmPrinter *AP, dwarf::Form Form) const {<br>
switch (Form) {<br>
case dwarf::DW_FORM_block1: return Size + sizeof(int8_t);<br>
case dwarf::DW_FORM_block2: return Size + sizeof(int16_t);<br>
@@ -486,7 +543,7 @@ unsigned DIELoc::SizeOf(const AsmPrinter<br>
}<br>
<br>
#ifndef NDEBUG<br>
-void DIELoc::print(raw_ostream &O) const {<br>
+void DIELoc::printImpl(raw_ostream &O) const {<br>
O << "ExprLoc: ";<br>
DIE::print(O, 5);<br>
}<br>
@@ -510,7 +567,7 @@ unsigned DIEBlock::ComputeSize(const Asm<br>
<br>
/// EmitValue - Emit block data.<br>
///<br>
-void DIEBlock::EmitValue(const AsmPrinter *Asm, dwarf::Form Form) const {<br>
+void DIEBlock::EmitValueImpl(const AsmPrinter *Asm, dwarf::Form Form) const {<br>
switch (Form) {<br>
default: llvm_unreachable("Improper form for block");<br>
case dwarf::DW_FORM_block1: Asm->EmitInt8(Size); break;<br>
@@ -526,7 +583,7 @@ void DIEBlock::EmitValue(const AsmPrinte<br>
<br>
/// SizeOf - Determine size of block data in bytes.<br>
///<br>
-unsigned DIEBlock::SizeOf(const AsmPrinter *AP, dwarf::Form Form) const {<br>
+unsigned DIEBlock::SizeOfImpl(const AsmPrinter *AP, dwarf::Form Form) const {<br>
switch (Form) {<br>
case dwarf::DW_FORM_block1: return Size + sizeof(int8_t);<br>
case dwarf::DW_FORM_block2: return Size + sizeof(int16_t);<br>
@@ -537,7 +594,7 @@ unsigned DIEBlock::SizeOf(const AsmPrint<br>
}<br>
<br>
#ifndef NDEBUG<br>
-void DIEBlock::print(raw_ostream &O) const {<br>
+void DIEBlock::printImpl(raw_ostream &O) const {<br>
O << "Blk: ";<br>
DIE::print(O, 5);<br>
}<br>
@@ -547,7 +604,7 @@ void DIEBlock::print(raw_ostream &O) con<br>
// DIELocList Implementation<br>
//===----------------------------------------------------------------------===//<br>
<br>
-unsigned DIELocList::SizeOf(const AsmPrinter *AP, dwarf::Form Form) const {<br>
+unsigned DIELocList::SizeOfImpl(const AsmPrinter *AP, dwarf::Form Form) const {<br>
if (Form == dwarf::DW_FORM_data4)<br>
return 4;<br>
if (Form == dwarf::DW_FORM_sec_offset)<br>
@@ -557,7 +614,7 @@ unsigned DIELocList::SizeOf(const AsmPri<br>
<br>
/// EmitValue - Emit label value.<br>
///<br>
-void DIELocList::EmitValue(const AsmPrinter *AP, dwarf::Form Form) const {<br>
+void DIELocList::EmitValueImpl(const AsmPrinter *AP, dwarf::Form Form) const {<br>
DwarfDebug *DD = AP->getDwarfDebug();<br>
MCSymbol *Label = DD->getDebugLocs().getList(Index).Label;<br>
<br>
@@ -568,7 +625,7 @@ void DIELocList::EmitValue(const AsmPrin<br>
}<br>
<br>
#ifndef NDEBUG<br>
-void DIELocList::print(raw_ostream &O) const {<br>
+void DIELocList::printImpl(raw_ostream &O) const {<br>
O << "LocList: " << Index;<br>
<br>
}<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>