diff options
Diffstat (limited to 'llvm/tools')
20 files changed, 37 insertions, 8 deletions
diff --git a/llvm/tools/llvm-pdbdump/BuiltinDumper.cpp b/llvm/tools/llvm-pdbdump/BuiltinDumper.cpp index 413a3fcba71..2ce1a783911 100644 --- a/llvm/tools/llvm-pdbdump/BuiltinDumper.cpp +++ b/llvm/tools/llvm-pdbdump/BuiltinDumper.cpp @@ -14,6 +14,7 @@ #include "llvm/DebugInfo/PDB/PDBSymbolTypeBuiltin.h" using namespace llvm; +using namespace llvm::pdb; BuiltinDumper::BuiltinDumper(LinePrinter &P) : PDBSymDumper(false), Printer(P) {} diff --git a/llvm/tools/llvm-pdbdump/BuiltinDumper.h b/llvm/tools/llvm-pdbdump/BuiltinDumper.h index c325b531e4f..7a2f1438669 100644 --- a/llvm/tools/llvm-pdbdump/BuiltinDumper.h +++ b/llvm/tools/llvm-pdbdump/BuiltinDumper.h @@ -14,6 +14,7 @@ #include "llvm/DebugInfo/PDB/PDBSymDumper.h" namespace llvm { +namespace pdb { class LinePrinter; @@ -29,5 +30,6 @@ private: LinePrinter &Printer; }; } +} #endif diff --git a/llvm/tools/llvm-pdbdump/ClassDefinitionDumper.cpp b/llvm/tools/llvm-pdbdump/ClassDefinitionDumper.cpp index 8abf3fa3912..1dfd879eb82 100644 --- a/llvm/tools/llvm-pdbdump/ClassDefinitionDumper.cpp +++ b/llvm/tools/llvm-pdbdump/ClassDefinitionDumper.cpp @@ -28,6 +28,7 @@ #include "llvm/Support/Format.h" using namespace llvm; +using namespace llvm::pdb; ClassDefinitionDumper::ClassDefinitionDumper(LinePrinter &P) : PDBSymDumper(true), Printer(P) {} diff --git a/llvm/tools/llvm-pdbdump/ClassDefinitionDumper.h b/llvm/tools/llvm-pdbdump/ClassDefinitionDumper.h index 5b48ba879cf..304e11dcb6c 100644 --- a/llvm/tools/llvm-pdbdump/ClassDefinitionDumper.h +++ b/llvm/tools/llvm-pdbdump/ClassDefinitionDumper.h @@ -19,6 +19,7 @@ #include <unordered_map> namespace llvm { +namespace pdb { class LinePrinter; @@ -58,5 +59,5 @@ private: int dumpAccessGroup(PDB_MemberAccess Access, const SymbolGroup &Group); }; } - +} #endif diff --git a/llvm/tools/llvm-pdbdump/CompilandDumper.cpp b/llvm/tools/llvm-pdbdump/CompilandDumper.cpp index 86b54589c24..b7de0f2534e 100644 --- a/llvm/tools/llvm-pdbdump/CompilandDumper.cpp +++ b/llvm/tools/llvm-pdbdump/CompilandDumper.cpp @@ -35,6 +35,7 @@ #include <utility> using namespace llvm; +using namespace llvm::pdb; CompilandDumper::CompilandDumper(LinePrinter &P) : PDBSymDumper(true), Printer(P) {} diff --git a/llvm/tools/llvm-pdbdump/CompilandDumper.h b/llvm/tools/llvm-pdbdump/CompilandDumper.h index 204d34acf1b..462aaeb2611 100644 --- a/llvm/tools/llvm-pdbdump/CompilandDumper.h +++ b/llvm/tools/llvm-pdbdump/CompilandDumper.h @@ -13,6 +13,7 @@ #include "llvm/DebugInfo/PDB/PDBSymDumper.h" namespace llvm { +namespace pdb { class LinePrinter; @@ -38,5 +39,6 @@ private: LinePrinter &Printer; }; } +} #endif diff --git a/llvm/tools/llvm-pdbdump/EnumDumper.cpp b/llvm/tools/llvm-pdbdump/EnumDumper.cpp index 3514c39f6e0..02c3df748be 100644 --- a/llvm/tools/llvm-pdbdump/EnumDumper.cpp +++ b/llvm/tools/llvm-pdbdump/EnumDumper.cpp @@ -18,6 +18,7 @@ #include "llvm/DebugInfo/PDB/PDBSymbolTypeEnum.h" using namespace llvm; +using namespace llvm::pdb; EnumDumper::EnumDumper(LinePrinter &P) : PDBSymDumper(true), Printer(P) {} diff --git a/llvm/tools/llvm-pdbdump/EnumDumper.h b/llvm/tools/llvm-pdbdump/EnumDumper.h index 23de0614247..0a34e1f89ad 100644 --- a/llvm/tools/llvm-pdbdump/EnumDumper.h +++ b/llvm/tools/llvm-pdbdump/EnumDumper.h @@ -13,6 +13,7 @@ #include "llvm/DebugInfo/PDB/PDBSymDumper.h" namespace llvm { +namespace pdb { class LinePrinter; @@ -26,5 +27,5 @@ private: LinePrinter &Printer; }; } - +} #endif diff --git a/llvm/tools/llvm-pdbdump/ExternalSymbolDumper.cpp b/llvm/tools/llvm-pdbdump/ExternalSymbolDumper.cpp index c4e9f474880..508a2405772 100644 --- a/llvm/tools/llvm-pdbdump/ExternalSymbolDumper.cpp +++ b/llvm/tools/llvm-pdbdump/ExternalSymbolDumper.cpp @@ -15,6 +15,7 @@ #include "llvm/Support/Format.h" using namespace llvm; +using namespace llvm::pdb; ExternalSymbolDumper::ExternalSymbolDumper(LinePrinter &P) : PDBSymDumper(true), Printer(P) {} diff --git a/llvm/tools/llvm-pdbdump/ExternalSymbolDumper.h b/llvm/tools/llvm-pdbdump/ExternalSymbolDumper.h index d77b09cdebf..b44b8a6fe98 100644 --- a/llvm/tools/llvm-pdbdump/ExternalSymbolDumper.h +++ b/llvm/tools/llvm-pdbdump/ExternalSymbolDumper.h @@ -13,6 +13,7 @@ #include "llvm/DebugInfo/PDB/PDBSymDumper.h" namespace llvm { +namespace pdb { class LinePrinter; @@ -28,5 +29,6 @@ private: LinePrinter &Printer; }; } +} #endif diff --git a/llvm/tools/llvm-pdbdump/FunctionDumper.cpp b/llvm/tools/llvm-pdbdump/FunctionDumper.cpp index 7f4181722e7..29ba15d521f 100644 --- a/llvm/tools/llvm-pdbdump/FunctionDumper.cpp +++ b/llvm/tools/llvm-pdbdump/FunctionDumper.cpp @@ -13,6 +13,7 @@ #include "llvm-pdbdump.h" #include "llvm/DebugInfo/PDB/IPDBSession.h" +#include "llvm/DebugInfo/PDB/PDBExtras.h" #include "llvm/DebugInfo/PDB/PDBSymbolData.h" #include "llvm/DebugInfo/PDB/PDBSymbolFunc.h" #include "llvm/DebugInfo/PDB/PDBSymbolFuncDebugEnd.h" @@ -28,11 +29,12 @@ using namespace llvm; using namespace llvm::codeview; +using namespace llvm::pdb; namespace { template <class T> void dumpClassParentWithScopeOperator(const T &Symbol, LinePrinter &Printer, - llvm::FunctionDumper &Dumper) { + FunctionDumper &Dumper) { uint32_t ClassParentId = Symbol.getClassParentId(); auto ClassParent = Symbol.getSession().template getConcreteSymbolById<PDBSymbolTypeUDT>( @@ -58,7 +60,7 @@ void FunctionDumper::start(const PDBSymbolTypeFunctionSig &Symbol, Symbol.getSession().getConcreteSymbolById<PDBSymbolTypeUDT>( ClassParentId); - CallingConvention CC = Symbol.getCallingConvention(); + PDB_CallingConv CC = Symbol.getCallingConvention(); bool ShouldDumpCallingConvention = true; if ((ClassParent && CC == CallingConvention::ThisCall) || (!ClassParent && CC == CallingConvention::NearStdCall)) { diff --git a/llvm/tools/llvm-pdbdump/FunctionDumper.h b/llvm/tools/llvm-pdbdump/FunctionDumper.h index 19a00145a1f..c71fafa18ed 100644 --- a/llvm/tools/llvm-pdbdump/FunctionDumper.h +++ b/llvm/tools/llvm-pdbdump/FunctionDumper.h @@ -13,7 +13,7 @@ #include "llvm/DebugInfo/PDB/PDBSymDumper.h" namespace llvm { - +namespace pdb { class LinePrinter; class FunctionDumper : public PDBSymDumper { @@ -38,5 +38,6 @@ private: LinePrinter &Printer; }; } +} #endif diff --git a/llvm/tools/llvm-pdbdump/LinePrinter.cpp b/llvm/tools/llvm-pdbdump/LinePrinter.cpp index a43727f02b5..db1180902cc 100644 --- a/llvm/tools/llvm-pdbdump/LinePrinter.cpp +++ b/llvm/tools/llvm-pdbdump/LinePrinter.cpp @@ -16,6 +16,9 @@ #include <algorithm> +using namespace llvm; +using namespace llvm::pdb; + namespace { bool IsItemExcluded(llvm::StringRef Item, std::list<llvm::Regex> &IncludeFilters, diff --git a/llvm/tools/llvm-pdbdump/LinePrinter.h b/llvm/tools/llvm-pdbdump/LinePrinter.h index b0a9d2cfc4e..a4401f8af95 100644 --- a/llvm/tools/llvm-pdbdump/LinePrinter.h +++ b/llvm/tools/llvm-pdbdump/LinePrinter.h @@ -18,6 +18,7 @@ #include <list> namespace llvm { +namespace pdb { class LinePrinter { friend class WithColor; @@ -88,5 +89,6 @@ private: raw_ostream &OS; }; } +} #endif diff --git a/llvm/tools/llvm-pdbdump/TypeDumper.cpp b/llvm/tools/llvm-pdbdump/TypeDumper.cpp index 39bdde93c6a..f6ec9637cf3 100644 --- a/llvm/tools/llvm-pdbdump/TypeDumper.cpp +++ b/llvm/tools/llvm-pdbdump/TypeDumper.cpp @@ -24,6 +24,7 @@ #include "llvm/DebugInfo/PDB/PDBSymbolTypeUDT.h" using namespace llvm; +using namespace llvm::pdb; TypeDumper::TypeDumper(LinePrinter &P) : PDBSymDumper(true), Printer(P) {} diff --git a/llvm/tools/llvm-pdbdump/TypeDumper.h b/llvm/tools/llvm-pdbdump/TypeDumper.h index 5c0832eccaf..76a477964f1 100644 --- a/llvm/tools/llvm-pdbdump/TypeDumper.h +++ b/llvm/tools/llvm-pdbdump/TypeDumper.h @@ -13,7 +13,7 @@ #include "llvm/DebugInfo/PDB/PDBSymDumper.h" namespace llvm { - +namespace pdb { class LinePrinter; class TypeDumper : public PDBSymDumper { @@ -30,5 +30,5 @@ private: LinePrinter &Printer; }; } - +} #endif diff --git a/llvm/tools/llvm-pdbdump/TypedefDumper.cpp b/llvm/tools/llvm-pdbdump/TypedefDumper.cpp index a6b5c53a6b3..b1e017613ce 100644 --- a/llvm/tools/llvm-pdbdump/TypedefDumper.cpp +++ b/llvm/tools/llvm-pdbdump/TypedefDumper.cpp @@ -23,6 +23,7 @@ #include "llvm/DebugInfo/PDB/PDBSymbolTypeUDT.h" using namespace llvm; +using namespace llvm::pdb; TypedefDumper::TypedefDumper(LinePrinter &P) : PDBSymDumper(true), Printer(P) {} diff --git a/llvm/tools/llvm-pdbdump/TypedefDumper.h b/llvm/tools/llvm-pdbdump/TypedefDumper.h index 8cd578cc6d2..c22b58a7e41 100644 --- a/llvm/tools/llvm-pdbdump/TypedefDumper.h +++ b/llvm/tools/llvm-pdbdump/TypedefDumper.h @@ -13,6 +13,7 @@ #include "llvm/DebugInfo/PDB/PDBSymDumper.h" namespace llvm { +namespace pdb { class LinePrinter; @@ -33,5 +34,6 @@ private: LinePrinter &Printer; }; } +} #endif diff --git a/llvm/tools/llvm-pdbdump/VariableDumper.cpp b/llvm/tools/llvm-pdbdump/VariableDumper.cpp index e5665b5fcaf..d8b66a6737c 100644 --- a/llvm/tools/llvm-pdbdump/VariableDumper.cpp +++ b/llvm/tools/llvm-pdbdump/VariableDumper.cpp @@ -27,6 +27,7 @@ #include "llvm/Support/Format.h" using namespace llvm; +using namespace llvm::pdb; VariableDumper::VariableDumper(LinePrinter &P) : PDBSymDumper(true), Printer(P) {} diff --git a/llvm/tools/llvm-pdbdump/VariableDumper.h b/llvm/tools/llvm-pdbdump/VariableDumper.h index 7d4af8afdf8..4f00358878c 100644 --- a/llvm/tools/llvm-pdbdump/VariableDumper.h +++ b/llvm/tools/llvm-pdbdump/VariableDumper.h @@ -15,6 +15,9 @@ namespace llvm { class StringRef; + +namespace pdb { + class LinePrinter; class VariableDumper : public PDBSymDumper { @@ -37,5 +40,5 @@ private: LinePrinter &Printer; }; } - +} #endif |