summaryrefslogtreecommitdiffstats
path: root/llvm/lib
diff options
context:
space:
mode:
Diffstat (limited to 'llvm/lib')
-rw-r--r--llvm/lib/DebugInfo/PDB/CMakeLists.txt4
-rw-r--r--llvm/lib/DebugInfo/PDB/Native/PDBFile.cpp12
-rw-r--r--llvm/lib/DebugInfo/PDB/Native/PDBFileBuilder.cpp18
-rw-r--r--llvm/lib/DebugInfo/PDB/Native/PDBStringTable.cpp (renamed from llvm/lib/DebugInfo/PDB/Native/StringTable.cpp)25
-rw-r--r--llvm/lib/DebugInfo/PDB/Native/PDBStringTableBuilder.cpp (renamed from llvm/lib/DebugInfo/PDB/Native/StringTableBuilder.cpp)18
5 files changed, 39 insertions, 38 deletions
diff --git a/llvm/lib/DebugInfo/PDB/CMakeLists.txt b/llvm/lib/DebugInfo/PDB/CMakeLists.txt
index bd35efb51c7..e1753018c7d 100644
--- a/llvm/lib/DebugInfo/PDB/CMakeLists.txt
+++ b/llvm/lib/DebugInfo/PDB/CMakeLists.txt
@@ -48,11 +48,11 @@ add_pdb_impl_folder(Native
Native/NativeSession.cpp
Native/PDBFile.cpp
Native/PDBFileBuilder.cpp
+ Native/PDBStringTable.cpp
+ Native/PDBStringTableBuilder.cpp
Native/PDBTypeServerHandler.cpp
Native/PublicsStream.cpp
Native/RawError.cpp
- Native/StringTable.cpp
- Native/StringTableBuilder.cpp
Native/SymbolStream.cpp
Native/TpiHashing.cpp
Native/TpiStream.cpp
diff --git a/llvm/lib/DebugInfo/PDB/Native/PDBFile.cpp b/llvm/lib/DebugInfo/PDB/Native/PDBFile.cpp
index 943e7fa13ab..f158c5c5386 100644
--- a/llvm/lib/DebugInfo/PDB/Native/PDBFile.cpp
+++ b/llvm/lib/DebugInfo/PDB/Native/PDBFile.cpp
@@ -15,9 +15,9 @@
#include "llvm/DebugInfo/PDB/Native/DbiStream.h"
#include "llvm/DebugInfo/PDB/Native/GlobalsStream.h"
#include "llvm/DebugInfo/PDB/Native/InfoStream.h"
+#include "llvm/DebugInfo/PDB/Native/PDBStringTable.h"
#include "llvm/DebugInfo/PDB/Native/PublicsStream.h"
#include "llvm/DebugInfo/PDB/Native/RawError.h"
-#include "llvm/DebugInfo/PDB/Native/StringTable.h"
#include "llvm/DebugInfo/PDB/Native/SymbolStream.h"
#include "llvm/DebugInfo/PDB/Native/TpiStream.h"
#include "llvm/Support/BinaryStream.h"
@@ -337,8 +337,8 @@ Expected<SymbolStream &> PDBFile::getPDBSymbolStream() {
return *Symbols;
}
-Expected<StringTable &> PDBFile::getStringTable() {
- if (!Strings || !StringTableStream) {
+Expected<PDBStringTable &> PDBFile::getStringTable() {
+ if (!Strings || !PDBStringTableStream) {
auto IS = getPDBInfoStream();
if (!IS)
return IS.takeError();
@@ -351,11 +351,11 @@ Expected<StringTable &> PDBFile::getStringTable() {
return NS.takeError();
BinaryStreamReader Reader(**NS);
- auto N = llvm::make_unique<StringTable>();
+ auto N = llvm::make_unique<PDBStringTable>();
if (auto EC = N->load(Reader))
return std::move(EC);
Strings = std::move(N);
- StringTableStream = std::move(*NS);
+ PDBStringTableStream = std::move(*NS);
}
return *Strings;
}
@@ -389,7 +389,7 @@ bool PDBFile::hasPDBSymbolStream() {
bool PDBFile::hasPDBTpiStream() const { return StreamTPI < getNumStreams(); }
-bool PDBFile::hasStringTable() {
+bool PDBFile::hasPDBStringTable() {
auto IS = getPDBInfoStream();
if (!IS)
return false;
diff --git a/llvm/lib/DebugInfo/PDB/Native/PDBFileBuilder.cpp b/llvm/lib/DebugInfo/PDB/Native/PDBFileBuilder.cpp
index b3c84903bc7..972c995bf4b 100644
--- a/llvm/lib/DebugInfo/PDB/Native/PDBFileBuilder.cpp
+++ b/llvm/lib/DebugInfo/PDB/Native/PDBFileBuilder.cpp
@@ -17,8 +17,8 @@
#include "llvm/DebugInfo/PDB/Native/DbiStreamBuilder.h"
#include "llvm/DebugInfo/PDB/Native/InfoStream.h"
#include "llvm/DebugInfo/PDB/Native/InfoStreamBuilder.h"
+#include "llvm/DebugInfo/PDB/Native/PDBStringTableBuilder.h"
#include "llvm/DebugInfo/PDB/Native/RawError.h"
-#include "llvm/DebugInfo/PDB/Native/StringTableBuilder.h"
#include "llvm/DebugInfo/PDB/Native/TpiStream.h"
#include "llvm/DebugInfo/PDB/Native/TpiStreamBuilder.h"
#include "llvm/Support/BinaryStream.h"
@@ -67,7 +67,9 @@ TpiStreamBuilder &PDBFileBuilder::getIpiBuilder() {
return *Ipi;
}
-StringTableBuilder &PDBFileBuilder::getStringTableBuilder() { return Strings; }
+PDBStringTableBuilder &PDBFileBuilder::getStringTableBuilder() {
+ return Strings;
+}
Error PDBFileBuilder::addNamedStream(StringRef Name, uint32_t Size) {
auto ExpectedStream = Msf->addStream(Size);
@@ -78,9 +80,9 @@ Error PDBFileBuilder::addNamedStream(StringRef Name, uint32_t Size) {
}
Expected<msf::MSFLayout> PDBFileBuilder::finalizeMsfLayout() {
- uint32_t StringTableSize = Strings.finalize();
+ uint32_t PDBStringTableSize = Strings.finalize();
- if (auto EC = addNamedStream("/names", StringTableSize))
+ if (auto EC = addNamedStream("/names", PDBStringTableSize))
return std::move(EC);
if (auto EC = addNamedStream("/LinkInfo", 0))
return std::move(EC);
@@ -144,12 +146,12 @@ Error PDBFileBuilder::commit(StringRef Filename) {
return EC;
}
- uint32_t StringTableStreamNo = 0;
- if (!NamedStreams.get("/names", StringTableStreamNo))
+ uint32_t PDBStringTableStreamNo = 0;
+ if (!NamedStreams.get("/names", PDBStringTableStreamNo))
return llvm::make_error<pdb::RawError>(raw_error_code::no_stream);
- auto NS = WritableMappedBlockStream::createIndexedStream(Layout, Buffer,
- StringTableStreamNo);
+ auto NS = WritableMappedBlockStream::createIndexedStream(
+ Layout, Buffer, PDBStringTableStreamNo);
BinaryStreamWriter NSWriter(*NS);
if (auto EC = Strings.commit(NSWriter))
return EC;
diff --git a/llvm/lib/DebugInfo/PDB/Native/StringTable.cpp b/llvm/lib/DebugInfo/PDB/Native/PDBStringTable.cpp
index 7e28389b838..fd3e69db86f 100644
--- a/llvm/lib/DebugInfo/PDB/Native/StringTable.cpp
+++ b/llvm/lib/DebugInfo/PDB/Native/PDBStringTable.cpp
@@ -1,4 +1,5 @@
-//===- StringTable.cpp - PDB String Table -----------------------*- C++ -*-===//
+//===- PDBStringTable.cpp - PDB String Table -----------------------*- C++
+//-*-===//
//
// The LLVM Compiler Infrastructure
//
@@ -7,7 +8,7 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/DebugInfo/PDB/Native/StringTable.h"
+#include "llvm/DebugInfo/PDB/Native/PDBStringTable.h"
#include "llvm/ADT/ArrayRef.h"
#include "llvm/DebugInfo/PDB/Native/Hash.h"
@@ -20,16 +21,16 @@ using namespace llvm;
using namespace llvm::support;
using namespace llvm::pdb;
-StringTable::StringTable() {}
+PDBStringTable::PDBStringTable() {}
-Error StringTable::load(BinaryStreamReader &Stream) {
+Error PDBStringTable::load(BinaryStreamReader &Stream) {
ByteSize = Stream.getLength();
- const StringTableHeader *H;
+ const PDBStringTableHeader *H;
if (auto EC = Stream.readObject(H))
return EC;
- if (H->Signature != StringTableSignature)
+ if (H->Signature != PDBStringTableSignature)
return make_error<RawError>(raw_error_code::corrupt_file,
"Invalid hash table signature");
if (H->HashVersion != 1 && H->HashVersion != 2)
@@ -61,16 +62,14 @@ Error StringTable::load(BinaryStreamReader &Stream) {
if (Stream.bytesRemaining() > 0)
return make_error<RawError>(raw_error_code::stream_too_long,
- "Unexpected bytes found in string table");
+ "Unexpected bytes found in string table");
return Error::success();
}
-uint32_t StringTable::getByteSize() const {
- return ByteSize;
-}
+uint32_t PDBStringTable::getByteSize() const { return ByteSize; }
-StringRef StringTable::getStringForID(uint32_t ID) const {
+StringRef PDBStringTable::getStringForID(uint32_t ID) const {
if (ID == IDs[0])
return StringRef();
@@ -85,7 +84,7 @@ StringRef StringTable::getStringForID(uint32_t ID) const {
return Result;
}
-uint32_t StringTable::getIDForString(StringRef Str) const {
+uint32_t PDBStringTable::getIDForString(StringRef Str) const {
uint32_t Hash = (HashVersion == 1) ? hashStringV1(Str) : hashStringV2(Str);
size_t Count = IDs.size();
uint32_t Start = Hash % Count;
@@ -104,6 +103,6 @@ uint32_t StringTable::getIDForString(StringRef Str) const {
return IDs[0];
}
-FixedStreamArray<support::ulittle32_t> StringTable::name_ids() const {
+FixedStreamArray<support::ulittle32_t> PDBStringTable::name_ids() const {
return IDs;
}
diff --git a/llvm/lib/DebugInfo/PDB/Native/StringTableBuilder.cpp b/llvm/lib/DebugInfo/PDB/Native/PDBStringTableBuilder.cpp
index 40dc8e1bfcb..4add6ead212 100644
--- a/llvm/lib/DebugInfo/PDB/Native/StringTableBuilder.cpp
+++ b/llvm/lib/DebugInfo/PDB/Native/PDBStringTableBuilder.cpp
@@ -1,4 +1,4 @@
-//===- StringTableBuilder.cpp - PDB String Table ----------------*- C++ -*-===//
+//===- PDBStringTableBuilder.cpp - PDB String Table -------------*- C++ -*-===//
//
// The LLVM Compiler Infrastructure
//
@@ -7,7 +7,7 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/DebugInfo/PDB/Native/StringTableBuilder.h"
+#include "llvm/DebugInfo/PDB/Native/PDBStringTableBuilder.h"
#include "llvm/ADT/ArrayRef.h"
#include "llvm/DebugInfo/PDB/Native/Hash.h"
#include "llvm/DebugInfo/PDB/Native/RawTypes.h"
@@ -19,7 +19,7 @@ using namespace llvm::support;
using namespace llvm::support::endian;
using namespace llvm::pdb;
-uint32_t StringTableBuilder::insert(StringRef S) {
+uint32_t PDBStringTableBuilder::insert(StringRef S) {
auto P = Strings.insert({S, StringSize});
// If a given string didn't exist in the string table, we want to increment
@@ -29,7 +29,7 @@ uint32_t StringTableBuilder::insert(StringRef S) {
return P.first->second;
}
-uint32_t StringTableBuilder::getStringIndex(StringRef S) {
+uint32_t PDBStringTableBuilder::getStringIndex(StringRef S) {
auto Iter = Strings.find(S);
assert(Iter != Strings.end());
return Iter->second;
@@ -44,9 +44,9 @@ static uint32_t computeBucketCount(uint32_t NumStrings) {
return (NumStrings + 1) * 1.25;
}
-uint32_t StringTableBuilder::finalize() {
+uint32_t PDBStringTableBuilder::finalize() {
uint32_t Size = 0;
- Size += sizeof(StringTableHeader);
+ Size += sizeof(PDBStringTableHeader);
Size += StringSize;
Size += sizeof(uint32_t); // Hash table begins with 4-byte size field.
@@ -58,10 +58,10 @@ uint32_t StringTableBuilder::finalize() {
return Size;
}
-Error StringTableBuilder::commit(BinaryStreamWriter &Writer) const {
+Error PDBStringTableBuilder::commit(BinaryStreamWriter &Writer) const {
// Write a header
- StringTableHeader H;
- H.Signature = StringTableSignature;
+ PDBStringTableHeader H;
+ H.Signature = PDBStringTableSignature;
H.HashVersion = 1;
H.ByteSize = StringSize;
if (auto EC = Writer.writeObject(H))
OpenPOWER on IntegriCloud