AsmPrinter: Cleanup DIEValue::EmitValue() API, NFC

Stop taking a `dwarf::Form` in `DIEValue::EmitValue()` and
`DIEValue::SizeOf()`, since they're always passed `DIEValue::getForm()`
anyway.  This is just left over from when `DIEValue` didn't know its own
form.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@240566 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Duncan P. N. Exon Smith
2015-06-24 18:48:11 +00:00
parent 262e948d2a
commit a0b5a74966
4 changed files with 15 additions and 16 deletions

View File

@@ -261,8 +261,7 @@ void AsmPrinter::emitDwarfDIE(const DIE &Die) const {
// Emit the DIE attribute values.
for (const auto &V : Die.values()) {
dwarf::Attribute Attr = V.getAttribute();
dwarf::Form Form = V.getForm();
assert(Form && "Too many attributes for DIE (check abbreviation)");
assert(V.getForm() && "Too many attributes for DIE (check abbreviation)");
if (isVerbose()) {
OutStreamer->AddComment(dwarf::AttributeString(Attr));
@@ -272,7 +271,7 @@ void AsmPrinter::emitDwarfDIE(const DIE &Die) const {
}
// Emit an attribute using the defined form.
V.EmitValue(this, Form);
V.EmitValue(this);
}
// Emit the DIE children if any.

View File

@@ -193,7 +193,7 @@ void DIE::dump() {
}
#endif
void DIEValue::EmitValue(const AsmPrinter *AP, dwarf::Form Form) const {
void DIEValue::EmitValue(const AsmPrinter *AP) const {
switch (Ty) {
case isNone:
llvm_unreachable("Expected valid DIEValue");
@@ -205,7 +205,7 @@ void DIEValue::EmitValue(const AsmPrinter *AP, dwarf::Form Form) const {
}
}
unsigned DIEValue::SizeOf(const AsmPrinter *AP, dwarf::Form Form) const {
unsigned DIEValue::SizeOf(const AsmPrinter *AP) const {
switch (Ty) {
case isNone:
llvm_unreachable("Expected valid DIEValue");
@@ -507,8 +507,8 @@ void DIETypeSignature::print(raw_ostream &O) const {
///
unsigned DIELoc::ComputeSize(const AsmPrinter *AP) const {
if (!Size) {
for (unsigned i = 0, N = Values.size(); i < N; ++i)
Size += Values[i].SizeOf(AP, Values[i].getForm());
for (const auto &V : Values)
Size += V.SizeOf(AP);
}
return Size;
@@ -527,8 +527,8 @@ void DIELoc::EmitValue(const AsmPrinter *Asm, dwarf::Form Form) const {
Asm->EmitULEB128(Size); break;
}
for (unsigned i = 0, N = Values.size(); i < N; ++i)
Values[i].EmitValue(Asm, Values[i].getForm());
for (const auto &V : Values)
V.EmitValue(Asm);
}
/// SizeOf - Determine size of location data in bytes.
@@ -560,8 +560,8 @@ void DIELoc::print(raw_ostream &O) const {
///
unsigned DIEBlock::ComputeSize(const AsmPrinter *AP) const {
if (!Size) {
for (unsigned i = 0, N = Values.size(); i < N; ++i)
Size += Values[i].SizeOf(AP, Values[i].getForm());
for (const auto &V : Values)
Size += V.SizeOf(AP);
}
return Size;
@@ -578,8 +578,8 @@ void DIEBlock::EmitValue(const AsmPrinter *Asm, dwarf::Form Form) const {
case dwarf::DW_FORM_block: Asm->EmitULEB128(Size); break;
}
for (unsigned i = 0, N = Values.size(); i < N; ++i)
Values[i].EmitValue(Asm, Values[i].getForm());
for (const auto &V : Values)
V.EmitValue(Asm);
}
/// SizeOf - Determine size of block data in bytes.

View File

@@ -103,7 +103,7 @@ unsigned DwarfFile::computeSizeAndOffset(DIE &Die, unsigned Offset) {
// Size the DIE attribute values.
for (const auto &V : Die.values())
// Size attribute value.
Offset += V.SizeOf(Asm, V.getForm());
Offset += V.SizeOf(Asm);
// Size the DIE children if any.
if (Die.hasChildren()) {