Make NativeExeSymbol a concrete subclass of NativeRawSymbol [PDB]
This moves exe symbol-specific method implementations out of NativeRawSymbol into a concrete subclass. Also adds implementations for hasCTypes and hasPrivateSymbols and a simple test to ensure the native reader can access the summary information for the executable from the PDB. Differential Revision: https://reviews.llvm.org/D31059 llvm-svn: 298005
This commit is contained in:
parent
5c5091fcb7
commit
21b54cf632
|
@ -0,0 +1,39 @@
|
||||||
|
//===- NativeExeSymbol.h - native impl for PDBSymbolExe ---------*- C++ -*-===//
|
||||||
|
//
|
||||||
|
// The LLVM Compiler Infrastructure
|
||||||
|
//
|
||||||
|
// This file is distributed under the University of Illinois Open Source
|
||||||
|
// License. See LICENSE.TXT for details.
|
||||||
|
//
|
||||||
|
//===----------------------------------------------------------------------===//
|
||||||
|
|
||||||
|
#ifndef LLVM_DEBUGINFO_PDB_NATIVE_NATIVEEXESYMBOL_H
|
||||||
|
#define LLVM_DEBUGINFO_PDB_NATIVE_NATIVEEXESYMBOL_H
|
||||||
|
|
||||||
|
#include "llvm/DebugInfo/PDB/Native/NativeRawSymbol.h"
|
||||||
|
#include "llvm/DebugInfo/PDB/Native/NativeSession.h"
|
||||||
|
|
||||||
|
namespace llvm {
|
||||||
|
namespace pdb {
|
||||||
|
|
||||||
|
class NativeExeSymbol : public NativeRawSymbol {
|
||||||
|
public:
|
||||||
|
NativeExeSymbol(NativeSession &Session);
|
||||||
|
|
||||||
|
std::unique_ptr<IPDBEnumSymbols>
|
||||||
|
findChildren(PDB_SymType Type) const override;
|
||||||
|
|
||||||
|
uint32_t getAge() const override;
|
||||||
|
std::string getSymbolsFileName() const override;
|
||||||
|
PDB_UniqueId getGuid() const override;
|
||||||
|
bool hasCTypes() const override;
|
||||||
|
bool hasPrivateSymbols() const override;
|
||||||
|
|
||||||
|
private:
|
||||||
|
PDBFile &File;
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace pdb
|
||||||
|
} // namespace llvm
|
||||||
|
|
||||||
|
#endif
|
|
@ -197,7 +197,7 @@ public:
|
||||||
bool wasInlined() const override;
|
bool wasInlined() const override;
|
||||||
std::string getUnused() const override;
|
std::string getUnused() const override;
|
||||||
|
|
||||||
private:
|
protected:
|
||||||
NativeSession &Session;
|
NativeSession &Session;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -42,6 +42,7 @@ add_pdb_impl_folder(Native
|
||||||
Native/ModStream.cpp
|
Native/ModStream.cpp
|
||||||
Native/NativeCompilandSymbol.cpp
|
Native/NativeCompilandSymbol.cpp
|
||||||
Native/NativeEnumModules.cpp
|
Native/NativeEnumModules.cpp
|
||||||
|
Native/NativeExeSymbol.cpp
|
||||||
Native/NativeRawSymbol.cpp
|
Native/NativeRawSymbol.cpp
|
||||||
Native/NamedStreamMap.cpp
|
Native/NamedStreamMap.cpp
|
||||||
Native/NativeSession.cpp
|
Native/NativeSession.cpp
|
||||||
|
|
|
@ -0,0 +1,79 @@
|
||||||
|
//===- NativeExeSymbol.cpp - native impl for PDBSymbolExe -------*- 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/NativeExeSymbol.h"
|
||||||
|
|
||||||
|
#include "llvm/DebugInfo/PDB/Native/DbiStream.h"
|
||||||
|
#include "llvm/DebugInfo/PDB/Native/InfoStream.h"
|
||||||
|
#include "llvm/DebugInfo/PDB/Native/NativeEnumModules.h"
|
||||||
|
#include "llvm/DebugInfo/PDB/Native/PDBFile.h"
|
||||||
|
|
||||||
|
namespace llvm {
|
||||||
|
namespace pdb {
|
||||||
|
|
||||||
|
NativeExeSymbol::NativeExeSymbol(NativeSession &Session)
|
||||||
|
: NativeRawSymbol(Session), File(Session.getPDBFile()) {}
|
||||||
|
|
||||||
|
std::unique_ptr<IPDBEnumSymbols>
|
||||||
|
NativeExeSymbol::findChildren(PDB_SymType Type) const {
|
||||||
|
switch (Type) {
|
||||||
|
case PDB_SymType::Compiland: {
|
||||||
|
auto Dbi = File.getPDBDbiStream();
|
||||||
|
if (Dbi) {
|
||||||
|
const auto Modules = Dbi->modules();
|
||||||
|
return std::unique_ptr<IPDBEnumSymbols>(
|
||||||
|
new NativeEnumModules(Session, Modules));
|
||||||
|
}
|
||||||
|
consumeError(Dbi.takeError());
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32_t NativeExeSymbol::getAge() const {
|
||||||
|
auto IS = File.getPDBInfoStream();
|
||||||
|
if (IS)
|
||||||
|
return IS->getAge();
|
||||||
|
consumeError(IS.takeError());
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string NativeExeSymbol::getSymbolsFileName() const {
|
||||||
|
return File.getFilePath();
|
||||||
|
}
|
||||||
|
|
||||||
|
PDB_UniqueId NativeExeSymbol::getGuid() const {
|
||||||
|
auto IS = File.getPDBInfoStream();
|
||||||
|
if (IS)
|
||||||
|
return IS->getGuid();
|
||||||
|
consumeError(IS.takeError());
|
||||||
|
return PDB_UniqueId{{0}};
|
||||||
|
}
|
||||||
|
|
||||||
|
bool NativeExeSymbol::hasCTypes() const {
|
||||||
|
auto Dbi = File.getPDBDbiStream();
|
||||||
|
if (Dbi)
|
||||||
|
return Dbi->hasCTypes();
|
||||||
|
consumeError(Dbi.takeError());
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool NativeExeSymbol::hasPrivateSymbols() const {
|
||||||
|
auto Dbi = File.getPDBDbiStream();
|
||||||
|
if (Dbi)
|
||||||
|
return !Dbi->isStripped();
|
||||||
|
consumeError(Dbi.takeError());
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace pdb
|
||||||
|
} // namespace llvm
|
|
@ -11,11 +11,7 @@
|
||||||
#include "llvm/ADT/ArrayRef.h"
|
#include "llvm/ADT/ArrayRef.h"
|
||||||
#include "llvm/ADT/STLExtras.h"
|
#include "llvm/ADT/STLExtras.h"
|
||||||
#include "llvm/DebugInfo/PDB/IPDBEnumChildren.h"
|
#include "llvm/DebugInfo/PDB/IPDBEnumChildren.h"
|
||||||
#include "llvm/DebugInfo/PDB/Native/DbiStream.h"
|
|
||||||
#include "llvm/DebugInfo/PDB/Native/InfoStream.h"
|
|
||||||
#include "llvm/DebugInfo/PDB/Native/NativeEnumModules.h"
|
|
||||||
#include "llvm/DebugInfo/PDB/Native/NativeSession.h"
|
#include "llvm/DebugInfo/PDB/Native/NativeSession.h"
|
||||||
#include "llvm/DebugInfo/PDB/Native/PDBFile.h"
|
|
||||||
#include "llvm/DebugInfo/PDB/PDBExtras.h"
|
#include "llvm/DebugInfo/PDB/PDBExtras.h"
|
||||||
#include "llvm/Support/ConvertUTF.h"
|
#include "llvm/Support/ConvertUTF.h"
|
||||||
#include "llvm/Support/raw_ostream.h"
|
#include "llvm/Support/raw_ostream.h"
|
||||||
|
@ -30,21 +26,6 @@ void NativeRawSymbol::dump(raw_ostream &OS, int Indent) const {}
|
||||||
|
|
||||||
std::unique_ptr<IPDBEnumSymbols>
|
std::unique_ptr<IPDBEnumSymbols>
|
||||||
NativeRawSymbol::findChildren(PDB_SymType Type) const {
|
NativeRawSymbol::findChildren(PDB_SymType Type) const {
|
||||||
switch (Type) {
|
|
||||||
case PDB_SymType::Compiland: {
|
|
||||||
auto &File = Session.getPDBFile();
|
|
||||||
auto Dbi = File.getPDBDbiStream();
|
|
||||||
if (Dbi) {
|
|
||||||
const auto Modules = Dbi->modules();
|
|
||||||
return std::unique_ptr<IPDBEnumSymbols>(
|
|
||||||
new NativeEnumModules(Session, Modules));
|
|
||||||
}
|
|
||||||
consumeError(Dbi.takeError());
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -82,11 +63,6 @@ uint32_t NativeRawSymbol::getAddressSection() const {
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t NativeRawSymbol::getAge() const {
|
uint32_t NativeRawSymbol::getAge() const {
|
||||||
auto &File = Session.getPDBFile();
|
|
||||||
auto IS = File.getPDBInfoStream();
|
|
||||||
if (IS)
|
|
||||||
return IS->getAge();
|
|
||||||
consumeError(IS.takeError());
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -272,9 +248,7 @@ uint32_t NativeRawSymbol::getSubTypeId() const {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string NativeRawSymbol::getSymbolsFileName() const {
|
std::string NativeRawSymbol::getSymbolsFileName() const { return ""; }
|
||||||
return Session.getPDBFile().getFilePath();
|
|
||||||
}
|
|
||||||
|
|
||||||
uint32_t NativeRawSymbol::getSymIndexId() const {
|
uint32_t NativeRawSymbol::getSymIndexId() const {
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -353,11 +327,6 @@ PDB_SymType NativeRawSymbol::getSymTag() const {
|
||||||
}
|
}
|
||||||
|
|
||||||
PDB_UniqueId NativeRawSymbol::getGuid() const {
|
PDB_UniqueId NativeRawSymbol::getGuid() const {
|
||||||
auto &File = Session.getPDBFile();
|
|
||||||
auto IS = File.getPDBInfoStream();
|
|
||||||
if (IS)
|
|
||||||
return IS->getGuid();
|
|
||||||
consumeError(IS.takeError());
|
|
||||||
return PDB_UniqueId{{0}};
|
return PDB_UniqueId{{0}};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
#include "llvm/DebugInfo/PDB/GenericError.h"
|
#include "llvm/DebugInfo/PDB/GenericError.h"
|
||||||
#include "llvm/DebugInfo/PDB/IPDBEnumChildren.h"
|
#include "llvm/DebugInfo/PDB/IPDBEnumChildren.h"
|
||||||
#include "llvm/DebugInfo/PDB/IPDBSourceFile.h"
|
#include "llvm/DebugInfo/PDB/IPDBSourceFile.h"
|
||||||
#include "llvm/DebugInfo/PDB/Native/NativeRawSymbol.h"
|
#include "llvm/DebugInfo/PDB/Native/NativeExeSymbol.h"
|
||||||
#include "llvm/DebugInfo/PDB/Native/PDBFile.h"
|
#include "llvm/DebugInfo/PDB/Native/PDBFile.h"
|
||||||
#include "llvm/DebugInfo/PDB/Native/RawError.h"
|
#include "llvm/DebugInfo/PDB/Native/RawError.h"
|
||||||
#include "llvm/DebugInfo/PDB/PDBSymbolCompiland.h"
|
#include "llvm/DebugInfo/PDB/PDBSymbolCompiland.h"
|
||||||
|
@ -71,7 +71,7 @@ uint64_t NativeSession::getLoadAddress() const { return 0; }
|
||||||
void NativeSession::setLoadAddress(uint64_t Address) {}
|
void NativeSession::setLoadAddress(uint64_t Address) {}
|
||||||
|
|
||||||
std::unique_ptr<PDBSymbolExe> NativeSession::getGlobalScope() {
|
std::unique_ptr<PDBSymbolExe> NativeSession::getGlobalScope() {
|
||||||
auto RawSymbol = llvm::make_unique<NativeRawSymbol>(*this);
|
auto RawSymbol = llvm::make_unique<NativeExeSymbol>(*this);
|
||||||
auto PdbSymbol(PDBSymbol::create(*this, std::move(RawSymbol)));
|
auto PdbSymbol(PDBSymbol::create(*this, std::move(RawSymbol)));
|
||||||
std::unique_ptr<PDBSymbolExe> ExeSymbol(
|
std::unique_ptr<PDBSymbolExe> ExeSymbol(
|
||||||
static_cast<PDBSymbolExe *>(PdbSymbol.release()));
|
static_cast<PDBSymbolExe *>(PdbSymbol.release()));
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
; Test that the native PDB reader gets the PDB summary correct.
|
||||||
|
; RUN: llvm-pdbdump pretty -native %p/../Inputs/empty.pdb \
|
||||||
|
; RUN: | FileCheck -check-prefix=EMPTY %s
|
||||||
|
|
||||||
|
; Reference output was generated with the DIA reader to ensure that the
|
||||||
|
; `-native` option produces identical output.
|
||||||
|
|
||||||
|
EMPTY: Size: 102400 bytes
|
||||||
|
EMPTY: Guid: {0B355641-86A0-A249-896F-9988FAE52FF0}
|
||||||
|
EMPTY: Age: 1
|
||||||
|
EMPTY: Attributes: HasPrivateSymbols
|
Loading…
Reference in New Issue