[ARMTargetParser] Follow-up for r239099: one case was missed

[oota-llvm.git] / tools / llvm-pdbdump / CompilandDumper.cpp

diff --git a/tools/llvm-pdbdump/CompilandDumper.cpp b/tools/llvm-pdbdump/CompilandDumper.cpp
index 14197a8b48e151b97efead6678c85e8d81cfa5ba..68ceb620627b9ff9a0fb24973f56578d3fb00959 100644 (file)
--- a/tools/llvm-pdbdump/CompilandDumper.cpp
+++ b/tools/llvm-pdbdump/CompilandDumper.cpp
@@ -38,14 +38,11 @@ using namespace llvm;
 CompilandDumper::CompilandDumper(LinePrinter &P)
     : PDBSymDumper(true), Printer(P) {}
 
-void CompilandDumper::dump(const PDBSymbolCompilandDetails &Symbol,
-                           raw_ostream &OS, int Indent) {}
+void CompilandDumper::dump(const PDBSymbolCompilandDetails &Symbol) {}
 
-void CompilandDumper::dump(const PDBSymbolCompilandEnv &Symbol, raw_ostream &OS,
-                           int Indent) {}
+void CompilandDumper::dump(const PDBSymbolCompilandEnv &Symbol) {}
 
-void CompilandDumper::start(const PDBSymbolCompiland &Symbol, raw_ostream &OS,
-                            int Indent, bool Children) {
+void CompilandDumper::start(const PDBSymbolCompiland &Symbol, bool Children) {
   std::string FullName = Symbol.getName();
   if (Printer.IsCompilandExcluded(FullName))
     return;
@@ -58,12 +55,11 @@ void CompilandDumper::start(const PDBSymbolCompiland &Symbol, raw_ostream &OS,
   auto ChildrenEnum = Symbol.findAllChildren();
   Printer.Indent();
   while (auto Child = ChildrenEnum->getNext())
-    Child->dump(OS, Indent + 2, *this);
+    Child->dump(*this);
   Printer.Unindent();
 }
 
-void CompilandDumper::dump(const PDBSymbolData &Symbol, raw_ostream &OS,
-                           int Indent) {
+void CompilandDumper::dump(const PDBSymbolData &Symbol) {
   if (Printer.IsSymbolExcluded(Symbol.getName()))
     return;
 
@@ -73,7 +69,7 @@ void CompilandDumper::dump(const PDBSymbolData &Symbol, raw_ostream &OS,
   case PDB_LocType::Static:
     Printer << "data: ";
     WithColor(Printer, PDB_ColorItem::Address).get()
-        << "[" << format_hex(Symbol.getRelativeVirtualAddress(), 10) << "]";
+        << "[" << format_hex(Symbol.getVirtualAddress(), 10) << "]";
     break;
   case PDB_LocType::Constant:
     Printer << "constant: ";
@@ -88,8 +84,7 @@ void CompilandDumper::dump(const PDBSymbolData &Symbol, raw_ostream &OS,
   WithColor(Printer, PDB_ColorItem::Identifier).get() << Symbol.getName();
 }
 
-void CompilandDumper::dump(const PDBSymbolFunc &Symbol, raw_ostream &OS,
-                           int Indent) {
+void CompilandDumper::dump(const PDBSymbolFunc &Symbol) {
   if (Symbol.getLength() == 0)
     return;
   if (Printer.IsSymbolExcluded(Symbol.getName()))
@@ -97,51 +92,49 @@ void CompilandDumper::dump(const PDBSymbolFunc &Symbol, raw_ostream &OS,
 
   Printer.NewLine();
   FunctionDumper Dumper(Printer);
-  Dumper.start(Symbol, FunctionDumper::PointerType::None, OS, Indent);
+  Dumper.start(Symbol, FunctionDumper::PointerType::None);
 }
 
-void CompilandDumper::dump(const PDBSymbolLabel &Symbol, raw_ostream &OS,
-                           int Indent) {
+void CompilandDumper::dump(const PDBSymbolLabel &Symbol) {
   if (Printer.IsSymbolExcluded(Symbol.getName()))
     return;
 
   Printer.NewLine();
   Printer << "label ";
   WithColor(Printer, PDB_ColorItem::Address).get()
-      << "[" << format_hex(Symbol.getRelativeVirtualAddress(), 10) << "] ";
+      << "[" << format_hex(Symbol.getVirtualAddress(), 10) << "] ";
   WithColor(Printer, PDB_ColorItem::Identifier).get() << Symbol.getName();
 }
 
-void CompilandDumper::dump(const PDBSymbolThunk &Symbol, raw_ostream &OS,
-                           int Indent) {
+void CompilandDumper::dump(const PDBSymbolThunk &Symbol) {
   if (Printer.IsSymbolExcluded(Symbol.getName()))
     return;
 
   Printer.NewLine();
   Printer << "thunk ";
   PDB_ThunkOrdinal Ordinal = Symbol.getThunkOrdinal();
-  uint32_t RVA = Symbol.getRelativeVirtualAddress();
+  uint64_t VA = Symbol.getVirtualAddress();
   if (Ordinal == PDB_ThunkOrdinal::TrampIncremental) {
-    uint32_t Target = Symbol.getTargetRelativeVirtualAddress();
-    WithColor(Printer, PDB_ColorItem::Address).get() << format_hex(RVA, 10);
+    uint64_t Target = Symbol.getTargetVirtualAddress();
+    WithColor(Printer, PDB_ColorItem::Address).get() << format_hex(VA, 10);
     Printer << " -> ";
     WithColor(Printer, PDB_ColorItem::Address).get() << format_hex(Target, 10);
   } else {
     WithColor(Printer, PDB_ColorItem::Address).get()
-        << "[" << format_hex(RVA, 10) << " - "
-        << format_hex(RVA + Symbol.getLength(), 10) << "]";
+        << "[" << format_hex(VA, 10) << " - "
+        << format_hex(VA + Symbol.getLength(), 10) << "]";
   }
-  Printer << " (" << Ordinal << ") ";
+  Printer << " (";
+  WithColor(Printer, PDB_ColorItem::Register).get() << Ordinal;
+  Printer << ") ";
   std::string Name = Symbol.getName();
   if (!Name.empty())
     WithColor(Printer, PDB_ColorItem::Identifier).get() << Name;
 }
 
-void CompilandDumper::dump(const PDBSymbolTypeTypedef &Symbol, raw_ostream &OS,
-                           int Indent) {}
+void CompilandDumper::dump(const PDBSymbolTypeTypedef &Symbol) {}
 
-void CompilandDumper::dump(const PDBSymbolUnknown &Symbol, raw_ostream &OS,
-                           int Indent) {
+void CompilandDumper::dump(const PDBSymbolUnknown &Symbol) {
   Printer.NewLine();
   Printer << "unknown (" << Symbol.getSymTag() << ")";
 }