[PDB] Rename some files in the native reader.

By calling these NativeType<foo>.cpp, they will all be sorted
together, and it also distinguishes the types from the symbols.

llvm-svn: 341609

diff --git a/llvm/include/llvm/DebugInfo/PDB/Native/NativeSession.h b/llvm/include/llvm/DebugInfo/PDB/Native/NativeSession.h
index fc1019c..161b828 100644 (file)
--- a/llvm/include/llvm/DebugInfo/PDB/Native/NativeSession.h
+++ b/llvm/include/llvm/DebugInfo/PDB/Native/NativeSession.h
@@ -15,7 +15,6 @@
 #include "llvm/DebugInfo/CodeView/TypeIndex.h"
 #include "llvm/DebugInfo/PDB/IPDBRawSymbol.h"
 #include "llvm/DebugInfo/PDB/IPDBSession.h"
-#include "llvm/DebugInfo/PDB/Native/NativeBuiltinSymbol.h"
 #include "llvm/DebugInfo/PDB/Native/NativeRawSymbol.h"
 #include "llvm/DebugInfo/PDB/Native/SymbolCache.h"
 #include "llvm/Support/Allocator.h"

diff --git a/llvm/include/llvm/DebugInfo/PDB/Native/NativeBuiltinSymbol.h b/llvm/include/llvm/DebugInfo/PDB/Native/NativeTypeBuiltin.h
similarity index 71%
rename from llvm/include/llvm/DebugInfo/PDB/Native/NativeBuiltinSymbol.h
rename to llvm/include/llvm/DebugInfo/PDB/Native/NativeTypeBuiltin.h
index 4f532c6..cc44729 100644 (file)
--- a/llvm/include/llvm/DebugInfo/PDB/Native/NativeBuiltinSymbol.h
+++ b/llvm/include/llvm/DebugInfo/PDB/Native/NativeTypeBuiltin.h
@@ -1,4 +1,4 @@
-//===- NativeBuiltinSymbol.h -------------------------------------- C++ -*-===//
+//===- NativeTypeBuiltin.h ---------------------------------------- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_DEBUGINFO_PDB_NATIVE_NATIVEBUILTINSYMBOL_H
-#define LLVM_DEBUGINFO_PDB_NATIVE_NATIVEBUILTINSYMBOL_H
+#ifndef LLVM_DEBUGINFO_PDB_NATIVE_NATIVETYPEBUILTIN_H
+#define LLVM_DEBUGINFO_PDB_NATIVE_NATIVETYPEBUILTIN_H
 
 #include "llvm/DebugInfo/PDB/Native/NativeRawSymbol.h"
 
@@ -19,11 +19,11 @@ namespace pdb {
 
 class NativeSession;
 
-class NativeBuiltinSymbol : public NativeRawSymbol {
+class NativeTypeBuiltin : public NativeRawSymbol {
 public:
-  NativeBuiltinSymbol(NativeSession &PDBSession, SymIndexId Id,
-                      PDB_BuiltinType T, uint64_t L);
-  ~NativeBuiltinSymbol() override;
+  NativeTypeBuiltin(NativeSession &PDBSession, SymIndexId Id, PDB_BuiltinType T,
+                    uint64_t L);
+  ~NativeTypeBuiltin() override;
 
   virtual std::unique_ptr<NativeRawSymbol> clone() const override;
 

diff --git a/llvm/include/llvm/DebugInfo/PDB/Native/NativeEnumSymbol.h b/llvm/include/llvm/DebugInfo/PDB/Native/NativeTypeEnum.h
similarity index 76%
rename from llvm/include/llvm/DebugInfo/PDB/Native/NativeEnumSymbol.h
rename to llvm/include/llvm/DebugInfo/PDB/Native/NativeTypeEnum.h
index 41b7b78..185ec50 100644 (file)
--- a/llvm/include/llvm/DebugInfo/PDB/Native/NativeEnumSymbol.h
+++ b/llvm/include/llvm/DebugInfo/PDB/Native/NativeTypeEnum.h
@@ -1,4 +1,4 @@
-//===- NativeEnumSymbol.h - info about enum type ----------------*- C++ -*-===//
+//===- NativeTypeEnum.h - info about enum type ------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_DEBUGINFO_PDB_NATIVE_NATIVEENUMSYMBOL_H
-#define LLVM_DEBUGINFO_PDB_NATIVE_NATIVEENUMSYMBOL_H
+#ifndef LLVM_DEBUGINFO_PDB_NATIVE_NATIVETYPEENUM_H
+#define LLVM_DEBUGINFO_PDB_NATIVE_NATIVETYPEENUM_H
 
 #include "llvm/DebugInfo/CodeView/CodeView.h"
 #include "llvm/DebugInfo/CodeView/TypeVisitorCallbacks.h"
@@ -18,12 +18,12 @@
 namespace llvm {
 namespace pdb {
 
-class NativeEnumSymbol : public NativeRawSymbol,
-                         public codeview::TypeVisitorCallbacks {
+class NativeTypeEnum : public NativeRawSymbol,
+                       public codeview::TypeVisitorCallbacks {
 public:
-  NativeEnumSymbol(NativeSession &Session, SymIndexId Id,
-                   const codeview::CVType &CV);
-  ~NativeEnumSymbol() override;
+  NativeTypeEnum(NativeSession &Session, SymIndexId Id,
+                 const codeview::CVType &CV);
+  ~NativeTypeEnum() override;
 
   std::unique_ptr<NativeRawSymbol> clone() const override;
 
@@ -57,4 +57,4 @@ protected:
 } // namespace pdb
 } // namespace llvm
 
-#endif // LLVM_DEBUGINFO_PDB_NATIVE_NATIVEENUMSYMBOL_H
+#endif // LLVM_DEBUGINFO_PDB_NATIVE_NATIVETYPEENUM_H

diff --git a/llvm/lib/DebugInfo/PDB/CMakeLists.txt b/llvm/lib/DebugInfo/PDB/CMakeLists.txt
index 9bf97dd..1a7d14f 100644 (file)
--- a/llvm/lib/DebugInfo/PDB/CMakeLists.txt
+++ b/llvm/lib/DebugInfo/PDB/CMakeLists.txt
@@ -46,13 +46,13 @@ add_pdb_impl_folder(Native
   Native/InfoStream.cpp
   Native/InfoStreamBuilder.cpp
   Native/ModuleDebugStream.cpp
-  Native/NativeBuiltinSymbol.cpp
   Native/NativeCompilandSymbol.cpp
   Native/NativeEnumModules.cpp
-  Native/NativeEnumSymbol.cpp
   Native/NativeEnumTypes.cpp
   Native/NativeExeSymbol.cpp
   Native/NativeRawSymbol.cpp
+  Native/NativeTypeBuiltin.cpp
+  Native/NativeTypeEnum.cpp
   Native/NamedStreamMap.cpp
   Native/NativeSession.cpp
   Native/PDBFile.cpp

diff --git a/llvm/lib/DebugInfo/PDB/Native/NativeBuiltinSymbol.cpp b/llvm/lib/DebugInfo/PDB/Native/NativeBuiltinSymbol.cpp
deleted file mode 100644 (file)
index 81e35e5..0000000
--- a/llvm/lib/DebugInfo/PDB/Native/NativeBuiltinSymbol.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-//===- NativeBuiltinSymbol.cpp ------------------------------------ C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/DebugInfo/PDB/Native/NativeBuiltinSymbol.h"
-
-
-namespace llvm {
-namespace pdb {
-
-NativeBuiltinSymbol::NativeBuiltinSymbol(NativeSession &PDBSession,
-                                         SymIndexId Id, PDB_BuiltinType T,
-                                         uint64_t L)
-    : NativeRawSymbol(PDBSession, PDB_SymType::BuiltinType, Id),
-      Session(PDBSession), Type(T), Length(L) {}
-
-NativeBuiltinSymbol::~NativeBuiltinSymbol() {}
-
-std::unique_ptr<NativeRawSymbol> NativeBuiltinSymbol::clone() const {
-  return llvm::make_unique<NativeBuiltinSymbol>(Session, SymbolId, Type, Length);
-}
-
-void NativeBuiltinSymbol::dump(raw_ostream &OS, int Indent) const {
-  // TODO:  Apparently nothing needs this yet.
-}
-
-PDB_SymType NativeBuiltinSymbol::getSymTag() const {
-  return PDB_SymType::BuiltinType;
-}
-
-PDB_BuiltinType NativeBuiltinSymbol::getBuiltinType() const { return Type; }
-
-bool NativeBuiltinSymbol::isConstType() const { return false; }
-
-uint64_t NativeBuiltinSymbol::getLength() const { return Length; }
-
-bool NativeBuiltinSymbol::isUnalignedType() const { return false; }
-
-bool NativeBuiltinSymbol::isVolatileType() const { return false; }
-
-} // namespace pdb
-} // namespace llvm

diff --git a/llvm/lib/DebugInfo/PDB/Native/NativeEnumTypes.cpp b/llvm/lib/DebugInfo/PDB/Native/NativeEnumTypes.cpp
index 70a187b..3486004 100644 (file)
--- a/llvm/lib/DebugInfo/PDB/Native/NativeEnumTypes.cpp
+++ b/llvm/lib/DebugInfo/PDB/Native/NativeEnumTypes.cpp
@@ -10,8 +10,8 @@
 #include "llvm/DebugInfo/PDB/Native/NativeEnumTypes.h"
 
 #include "llvm/DebugInfo/PDB/IPDBEnumChildren.h"
-#include "llvm/DebugInfo/PDB/Native/NativeEnumSymbol.h"
 #include "llvm/DebugInfo/PDB/Native/NativeSession.h"
+#include "llvm/DebugInfo/PDB/Native/NativeTypeEnum.h"
 #include "llvm/DebugInfo/PDB/PDBSymbol.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolTypeEnum.h"
 

diff --git a/llvm/lib/DebugInfo/PDB/Native/NativeSession.cpp b/llvm/lib/DebugInfo/PDB/Native/NativeSession.cpp
index 1601b35..c970323 100644 (file)
--- a/llvm/lib/DebugInfo/PDB/Native/NativeSession.cpp
+++ b/llvm/lib/DebugInfo/PDB/Native/NativeSession.cpp
@@ -13,11 +13,11 @@
 #include "llvm/DebugInfo/CodeView/TypeIndex.h"
 #include "llvm/DebugInfo/PDB/IPDBEnumChildren.h"
 #include "llvm/DebugInfo/PDB/IPDBSourceFile.h"
-#include "llvm/DebugInfo/PDB/Native/NativeBuiltinSymbol.h"
 #include "llvm/DebugInfo/PDB/Native/NativeCompilandSymbol.h"
-#include "llvm/DebugInfo/PDB/Native/NativeEnumSymbol.h"
 #include "llvm/DebugInfo/PDB/Native/NativeEnumTypes.h"
 #include "llvm/DebugInfo/PDB/Native/NativeExeSymbol.h"
+#include "llvm/DebugInfo/PDB/Native/NativeTypeBuiltin.h"
+#include "llvm/DebugInfo/PDB/Native/NativeTypeEnum.h"
 #include "llvm/DebugInfo/PDB/Native/PDBFile.h"
 #include "llvm/DebugInfo/PDB/Native/RawError.h"
 #include "llvm/DebugInfo/PDB/Native/SymbolCache.h"

diff --git a/llvm/lib/DebugInfo/PDB/Native/NativeTypeBuiltin.cpp b/llvm/lib/DebugInfo/PDB/Native/NativeTypeBuiltin.cpp
new file mode 100644 (file)
index 0000000..8510def
--- /dev/null
+++ b/llvm/lib/DebugInfo/PDB/Native/NativeTypeBuiltin.cpp
@@ -0,0 +1,45 @@
+//===- NativeTypeBuiltin.cpp -------------------------------------- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "llvm/DebugInfo/PDB/Native/NativeTypeBuiltin.h"
+
+namespace llvm {
+namespace pdb {
+
+NativeTypeBuiltin::NativeTypeBuiltin(NativeSession &PDBSession, SymIndexId Id,
+                                     PDB_BuiltinType T, uint64_t L)
+    : NativeRawSymbol(PDBSession, PDB_SymType::BuiltinType, Id),
+      Session(PDBSession), Type(T), Length(L) {}
+
+NativeTypeBuiltin::~NativeTypeBuiltin() {}
+
+std::unique_ptr<NativeRawSymbol> NativeTypeBuiltin::clone() const {
+  return llvm::make_unique<NativeTypeBuiltin>(Session, SymbolId, Type, Length);
+}
+
+void NativeTypeBuiltin::dump(raw_ostream &OS, int Indent) const {
+  // TODO:  Apparently nothing needs this yet.
+}
+
+PDB_SymType NativeTypeBuiltin::getSymTag() const {
+  return PDB_SymType::BuiltinType;
+}
+
+PDB_BuiltinType NativeTypeBuiltin::getBuiltinType() const { return Type; }
+
+bool NativeTypeBuiltin::isConstType() const { return false; }
+
+uint64_t NativeTypeBuiltin::getLength() const { return Length; }
+
+bool NativeTypeBuiltin::isUnalignedType() const { return false; }
+
+bool NativeTypeBuiltin::isVolatileType() const { return false; }
+
+} // namespace pdb
+} // namespace llvm

diff --git a/llvm/lib/DebugInfo/PDB/Native/NativeEnumSymbol.cpp b/llvm/lib/DebugInfo/PDB/Native/NativeTypeEnum.cpp
similarity index 58%
rename from llvm/lib/DebugInfo/PDB/Native/NativeEnumSymbol.cpp
rename to llvm/lib/DebugInfo/PDB/Native/NativeTypeEnum.cpp
index 893afd4..1059841 100644 (file)
--- a/llvm/lib/DebugInfo/PDB/Native/NativeEnumSymbol.cpp
+++ b/llvm/lib/DebugInfo/PDB/Native/NativeTypeEnum.cpp
@@ -1,4 +1,4 @@
-//===- NativeEnumSymbol.cpp - info about enum type --------------*- C++ -*-===//
+//===- NativeTypeEnum.cpp - info about enum type ----------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/DebugInfo/PDB/Native/NativeEnumSymbol.h"
+#include "llvm/DebugInfo/PDB/Native/NativeTypeEnum.h"
 
 #include "llvm/DebugInfo/CodeView/CVTypeVisitor.h"
 #include "llvm/DebugInfo/CodeView/TypeRecord.h"
@@ -20,22 +20,22 @@
 using namespace llvm;
 using namespace llvm::pdb;
 
-NativeEnumSymbol::NativeEnumSymbol(NativeSession &Session, SymIndexId Id,
-                                   const codeview::CVType &CVT)
+NativeTypeEnum::NativeTypeEnum(NativeSession &Session, SymIndexId Id,
+                               const codeview::CVType &CVT)
     : NativeRawSymbol(Session, PDB_SymType::Enum, Id), CV(CVT),
       Record(codeview::TypeRecordKind::Enum) {
   assert(CV.kind() == codeview::TypeLeafKind::LF_ENUM);
   cantFail(visitTypeRecord(CV, *this));
 }
 
-NativeEnumSymbol::~NativeEnumSymbol() {}
+NativeTypeEnum::~NativeTypeEnum() {}
 
-std::unique_ptr<NativeRawSymbol> NativeEnumSymbol::clone() const {
-  return llvm::make_unique<NativeEnumSymbol>(Session, SymbolId, CV);
+std::unique_ptr<NativeRawSymbol> NativeTypeEnum::clone() const {
+  return llvm::make_unique<NativeTypeEnum>(Session, SymbolId, CV);
 }
 
 std::unique_ptr<IPDBEnumSymbols>
-NativeEnumSymbol::findChildren(PDB_SymType Type) const {
+NativeTypeEnum::findChildren(PDB_SymType Type) const {
   switch (Type) {
   case PDB_SymType::Data: {
     // TODO(amccarth):  Provide an actual implementation.
@@ -46,39 +46,39 @@ NativeEnumSymbol::findChildren(PDB_SymType Type) const {
   }
 }
 
-Error NativeEnumSymbol::visitKnownRecord(codeview::CVType &CVR,
-                                         codeview::EnumRecord &ER) {
+Error NativeTypeEnum::visitKnownRecord(codeview::CVType &CVR,
+                                       codeview::EnumRecord &ER) {
   Record = ER;
   return Error::success();
 }
 
-Error NativeEnumSymbol::visitKnownMember(codeview::CVMemberRecord &CVM,
-                                         codeview::EnumeratorRecord &R) {
+Error NativeTypeEnum::visitKnownMember(codeview::CVMemberRecord &CVM,
+                                       codeview::EnumeratorRecord &R) {
   return Error::success();
 }
 
-PDB_SymType NativeEnumSymbol::getSymTag() const { return PDB_SymType::Enum; }
+PDB_SymType NativeTypeEnum::getSymTag() const { return PDB_SymType::Enum; }
 
-uint32_t NativeEnumSymbol::getClassParentId() const { return 0xFFFFFFFF; }
+uint32_t NativeTypeEnum::getClassParentId() const { return 0xFFFFFFFF; }
 
-uint32_t NativeEnumSymbol::getUnmodifiedTypeId() const { return 0; }
+uint32_t NativeTypeEnum::getUnmodifiedTypeId() const { return 0; }
 
-bool NativeEnumSymbol::hasConstructor() const {
+bool NativeTypeEnum::hasConstructor() const {
   return bool(Record.getOptions() &
               codeview::ClassOptions::HasConstructorOrDestructor);
 }
 
-bool NativeEnumSymbol::hasAssignmentOperator() const {
+bool NativeTypeEnum::hasAssignmentOperator() const {
   return bool(Record.getOptions() &
               codeview::ClassOptions::HasOverloadedAssignmentOperator);
 }
 
-bool NativeEnumSymbol::hasCastOperator() const {
+bool NativeTypeEnum::hasCastOperator() const {
   return bool(Record.getOptions() &
               codeview::ClassOptions::HasConversionOperator);
 }
 
-uint64_t NativeEnumSymbol::getLength() const {
+uint64_t NativeTypeEnum::getLength() const {
   const auto Id = Session.getSymbolCache().findSymbolByTypeIndex(
       Record.getUnderlyingType());
   const auto UnderlyingType =
@@ -86,26 +86,26 @@ uint64_t NativeEnumSymbol::getLength() const {
   return UnderlyingType ? UnderlyingType->getLength() : 0;
 }
 
-std::string NativeEnumSymbol::getName() const { return Record.getName(); }
+std::string NativeTypeEnum::getName() const { return Record.getName(); }
 
-bool NativeEnumSymbol::isNested() const {
+bool NativeTypeEnum::isNested() const {
   return bool(Record.getOptions() & codeview::ClassOptions::Nested);
 }
 
-bool NativeEnumSymbol::hasOverloadedOperator() const {
+bool NativeTypeEnum::hasOverloadedOperator() const {
   return bool(Record.getOptions() &
               codeview::ClassOptions::HasOverloadedOperator);
 }
 
-bool NativeEnumSymbol::isPacked() const {
+bool NativeTypeEnum::isPacked() const {
   return bool(Record.getOptions() & codeview::ClassOptions::Packed);
 }
 
-bool NativeEnumSymbol::isScoped() const {
+bool NativeTypeEnum::isScoped() const {
   return bool(Record.getOptions() & codeview::ClassOptions::Scoped);
 }
 
-uint32_t NativeEnumSymbol::getTypeId() const {
+uint32_t NativeTypeEnum::getTypeId() const {
   return Session.getSymbolCache().findSymbolByTypeIndex(
       Record.getUnderlyingType());
 }

diff --git a/llvm/lib/DebugInfo/PDB/Native/SymbolCache.cpp b/llvm/lib/DebugInfo/PDB/Native/SymbolCache.cpp
index 9f8e020..abba065 100644 (file)
--- a/llvm/lib/DebugInfo/PDB/Native/SymbolCache.cpp
+++ b/llvm/lib/DebugInfo/PDB/Native/SymbolCache.cpp
@@ -2,10 +2,11 @@
 
 #include "llvm/DebugInfo/PDB/Native/DbiStream.h"
 #include "llvm/DebugInfo/PDB/Native/NativeCompilandSymbol.h"
-#include "llvm/DebugInfo/PDB/Native/NativeEnumSymbol.h"
 #include "llvm/DebugInfo/PDB/Native/NativeEnumTypes.h"
 #include "llvm/DebugInfo/PDB/Native/NativeRawSymbol.h"
 #include "llvm/DebugInfo/PDB/Native/NativeSession.h"
+#include "llvm/DebugInfo/PDB/Native/NativeTypeBuiltin.h"
+#include "llvm/DebugInfo/PDB/Native/NativeTypeEnum.h"
 #include "llvm/DebugInfo/PDB/Native/PDBFile.h"
 #include "llvm/DebugInfo/PDB/Native/TpiStream.h"
 #include "llvm/DebugInfo/PDB/PDBSymbol.h"
@@ -83,8 +84,8 @@ SymIndexId SymbolCache::findSymbolByTypeIndex(codeview::TypeIndex Index) {
     if (It == std::end(BuiltinTypes))
       return 0;
     SymIndexId Id = Cache.size();
-    Cache.emplace_back(llvm::make_unique<NativeBuiltinSymbol>(
-        Session, Id, It->Type, It->Size));
+    Cache.emplace_back(
+        llvm::make_unique<NativeTypeBuiltin>(Session, Id, It->Type, It->Size));
     TypeIndexToSymbolId[Index] = Id;
     return Id;
   }
@@ -101,7 +102,7 @@ SymIndexId SymbolCache::findSymbolByTypeIndex(codeview::TypeIndex Index) {
   SymIndexId Id = 0;
   switch (CVT.kind()) {
   case codeview::LF_ENUM:
-    Id = createSymbol<NativeEnumSymbol>(CVT);
+    Id = createSymbol<NativeTypeEnum>(CVT);
     break;
   default:
     assert(false && "Unsupported native symbol type!");