<div dir="ltr">Hello Zachary,<br><br>This commit added warning to some builders:<br><br>SymbolSerializer.cpp.obj : warning LNK4221: This object file does not define any previously undefined public symbols, so it will not be used by any link operation that consumes this library<br><br><a href="http://lab.llvm.org:8011/builders/lld-x86_64-win7/builds/2384">http://lab.llvm.org:8011/builders/lld-x86_64-win7/builds/2384</a><br><br>Please have a look at this?<br><br>Thanks<br><br>Galina<br></div><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Dec 16, 2016 at 2:48 PM, Zachary Turner via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: zturner<br>
Date: Fri Dec 16 16:48:14 2016<br>
New Revision: 290000<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=290000&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=290000&view=rev</a><br>
Log:<br>
Resubmit "[CodeView] Hook CodeViewRecordIO for reading/writing symbols."<br>
<br>
The original patch was broken due to some undefined behavior<br>
as well as warnings that were triggering -Werror.<br>
<br>
Added:<br>
llvm/trunk/include/llvm/<wbr>DebugInfo/CodeView/<wbr>SymbolRecordMapping.h<br>
llvm/trunk/include/llvm/<wbr>DebugInfo/CodeView/<wbr>SymbolSerializer.h<br>
llvm/trunk/lib/DebugInfo/<wbr>CodeView/SymbolRecordMapping.<wbr>cpp<br>
llvm/trunk/lib/DebugInfo/<wbr>CodeView/SymbolSerializer.cpp<br>
Modified:<br>
llvm/trunk/include/llvm/<wbr>DebugInfo/CodeView/CodeView.h<br>
llvm/trunk/include/llvm/<wbr>DebugInfo/CodeView/<wbr>CodeViewRecordIO.h<br>
llvm/trunk/include/llvm/<wbr>DebugInfo/CodeView/<wbr>SymbolDeserializer.h<br>
llvm/trunk/include/llvm/<wbr>DebugInfo/CodeView/<wbr>SymbolRecord.h<br>
llvm/trunk/lib/CodeGen/<wbr>AsmPrinter/CodeViewDebug.cpp<br>
llvm/trunk/lib/DebugInfo/<wbr>CodeView/CMakeLists.txt<br>
llvm/trunk/lib/DebugInfo/<wbr>CodeView/CodeViewRecordIO.cpp<br>
llvm/trunk/lib/DebugInfo/<wbr>CodeView/SymbolDumper.cpp<br>
llvm/trunk/lib/MC/MCCodeView.<wbr>cpp<br>
llvm/trunk/test/DebugInfo/PDB/<wbr>pdb-yaml-symbols.test<br>
llvm/trunk/test/DebugInfo/PDB/<wbr>pdbdump-headers.test<br>
llvm/trunk/tools/llvm-pdbdump/<wbr>YamlSymbolDumper.cpp<br>
<br>
Modified: llvm/trunk/include/llvm/<wbr>DebugInfo/CodeView/CodeView.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/CodeView/CodeView.h?rev=290000&r1=289999&r2=290000&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/include/<wbr>llvm/DebugInfo/CodeView/<wbr>CodeView.h?rev=290000&r1=<wbr>289999&r2=290000&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/include/llvm/<wbr>DebugInfo/CodeView/CodeView.h (original)<br>
+++ llvm/trunk/include/llvm/<wbr>DebugInfo/CodeView/CodeView.h Fri Dec 16 16:48:14 2016<br>
@@ -535,7 +535,7 @@ enum class ThunkOrdinal : uint8_t {<br>
BranchIsland<br>
};<br>
<br>
-enum class TrampolineType { TrampIncremental, BranchIsland };<br>
+enum class TrampolineType : uint16_t { TrampIncremental, BranchIsland };<br>
<br>
// These values correspond to the CV_SourceChksum_t enumeration.<br>
enum class FileChecksumKind : uint8_t { None, MD5, SHA1, SHA256 };<br>
<br>
Modified: llvm/trunk/include/llvm/<wbr>DebugInfo/CodeView/<wbr>CodeViewRecordIO.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/CodeView/CodeViewRecordIO.h?rev=290000&r1=289999&r2=290000&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/include/<wbr>llvm/DebugInfo/CodeView/<wbr>CodeViewRecordIO.h?rev=290000&<wbr>r1=289999&r2=290000&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/include/llvm/<wbr>DebugInfo/CodeView/<wbr>CodeViewRecordIO.h (original)<br>
+++ llvm/trunk/include/llvm/<wbr>DebugInfo/CodeView/<wbr>CodeViewRecordIO.h Fri Dec 16 16:48:14 2016<br>
@@ -46,6 +46,17 @@ public:<br>
<br>
uint32_t maxFieldLength() const;<br>
<br>
+ template <typename T> Error mapObject(T &Value) {<br>
+ if (isWriting())<br>
+ return Writer->writeObject(Value);<br>
+<br>
+ const T *ValuePtr;<br>
+ if (auto EC = Reader->readObject(ValuePtr))<br>
+ return EC;<br>
+ Value = *ValuePtr;<br>
+ return Error::success();<br>
+ }<br>
+<br>
template <typename T> Error mapInteger(T &Value) {<br>
if (isWriting())<br>
return Writer->writeInteger(Value);<br>
@@ -75,6 +86,8 @@ public:<br>
Error mapStringZ(StringRef &Value);<br>
Error mapGuid(StringRef &Guid);<br>
<br>
+ Error mapStringZVectorZ(std::vector<<wbr>StringRef> &Value);<br>
+<br>
template <typename SizeType, typename T, typename ElementMapper><br>
Error mapVectorN(T &Items, const ElementMapper &Mapper) {<br>
SizeType Size;<br>
@@ -121,6 +134,7 @@ public:<br>
}<br>
<br>
Error mapByteVectorTail(ArrayRef<<wbr>uint8_t> &Bytes);<br>
+ Error mapByteVectorTail(std::vector<<wbr>uint8_t> &Bytes);<br>
<br>
Error skipPadding();<br>
<br>
<br>
Modified: llvm/trunk/include/llvm/<wbr>DebugInfo/CodeView/<wbr>SymbolDeserializer.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/CodeView/SymbolDeserializer.h?rev=290000&r1=289999&r2=290000&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/include/<wbr>llvm/DebugInfo/CodeView/<wbr>SymbolDeserializer.h?rev=<wbr>290000&r1=289999&r2=290000&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/include/llvm/<wbr>DebugInfo/CodeView/<wbr>SymbolDeserializer.h (original)<br>
+++ llvm/trunk/include/llvm/<wbr>DebugInfo/CodeView/<wbr>SymbolDeserializer.h Fri Dec 16 16:48:14 2016<br>
@@ -12,6 +12,7 @@<br>
<br>
#include "llvm/ADT/ArrayRef.h"<br>
#include "llvm/DebugInfo/CodeView/<wbr>SymbolRecord.h"<br>
+#include "llvm/DebugInfo/CodeView/<wbr>SymbolRecordMapping.h"<br>
#include "llvm/DebugInfo/CodeView/<wbr>SymbolVisitorCallbacks.h"<br>
#include "llvm/DebugInfo/CodeView/<wbr>SymbolVisitorDelegate.h"<br>
#include "llvm/DebugInfo/MSF/<wbr>ByteStream.h"<br>
@@ -22,41 +23,50 @@ namespace llvm {<br>
namespace codeview {<br>
class SymbolVisitorDelegate;<br>
class SymbolDeserializer : public SymbolVisitorCallbacks {<br>
+ struct MappingInfo {<br>
+ explicit MappingInfo(ArrayRef<uint8_t> RecordData)<br>
+ : Stream(RecordData), Reader(Stream), Mapping(Reader) {}<br>
+<br>
+ msf::ByteStream Stream;<br>
+ msf::StreamReader Reader;<br>
+ SymbolRecordMapping Mapping;<br>
+ };<br>
+<br>
public:<br>
explicit SymbolDeserializer(<wbr>SymbolVisitorDelegate *Delegate)<br>
: Delegate(Delegate) {}<br>
<br>
+ Error visitSymbolBegin(CVSymbol &Record) override {<br>
+ assert(!Mapping && "Already in a symbol mapping!");<br>
+ Mapping = llvm::make_unique<MappingInfo><wbr>(Record.content());<br>
+ return Mapping->Mapping.<wbr>visitSymbolBegin(Record);<br>
+ }<br>
+ Error visitSymbolEnd(CVSymbol &Record) override {<br>
+ assert(Mapping && "Not in a symbol mapping!");<br>
+ auto EC = Mapping->Mapping.<wbr>visitSymbolEnd(Record);<br>
+ Mapping.reset();<br>
+ return EC;<br>
+ }<br>
+<br>
#define SYMBOL_RECORD(EnumName, EnumVal, Name) \<br>
Error visitKnownRecord(CVSymbol &CVR, Name &Record) override { \<br>
- return defaultVisitKnownRecord(CVR, Record); \<br>
+ return visitKnownRecordImpl(CVR, Record); \<br>
}<br>
#define SYMBOL_RECORD_ALIAS(EnumName, EnumVal, Name, AliasName)<br>
#include "CVSymbolTypes.def"<br>
<br>
-protected:<br>
- template <typename T><br>
- Error deserializeRecord(msf::<wbr>StreamReader &Reader, SymbolKind Kind,<br>
- T &Record) const {<br>
- uint32_t RecordOffset = Delegate ? Delegate->getRecordOffset(<wbr>Reader) : 0;<br>
- SymbolRecordKind RK = static_cast<SymbolRecordKind>(<wbr>Kind);<br>
- auto ExpectedRecord = T::deserialize(RK, RecordOffset, Reader);<br>
- if (!ExpectedRecord)<br>
- return ExpectedRecord.takeError();<br>
- Record = std::move(*ExpectedRecord);<br>
- return Error::success();<br>
- }<br>
-<br>
private:<br>
- template <typename T><br>
- Error defaultVisitKnownRecord(<wbr>CVSymbol &CVR, T &Record) {<br>
- msf::ByteStream S(CVR.content());<br>
- msf::StreamReader SR(S);<br>
- if (auto EC = deserializeRecord(SR, CVR.Type, Record))<br>
+ template <typename T> Error visitKnownRecordImpl(CVSymbol &CVR, T &Record) {<br>
+<br>
+ Record.RecordOffset =<br>
+ Delegate ? Delegate->getRecordOffset(<wbr>Mapping->Reader) : 0;<br>
+ if (auto EC = Mapping->Mapping.<wbr>visitKnownRecord(CVR, Record))<br>
return EC;<br>
return Error::success();<br>
}<br>
<br>
SymbolVisitorDelegate *Delegate;<br>
+ std::unique_ptr<MappingInfo> Mapping;<br>
};<br>
}<br>
}<br>
<br>
Modified: llvm/trunk/include/llvm/<wbr>DebugInfo/CodeView/<wbr>SymbolRecord.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/CodeView/SymbolRecord.h?rev=290000&r1=289999&r2=290000&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/include/<wbr>llvm/DebugInfo/CodeView/<wbr>SymbolRecord.h?rev=290000&r1=<wbr>289999&r2=290000&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/include/llvm/<wbr>DebugInfo/CodeView/<wbr>SymbolRecord.h (original)<br>
+++ llvm/trunk/include/llvm/<wbr>DebugInfo/CodeView/<wbr>SymbolRecord.h Fri Dec 16 16:48:14 2016<br>
@@ -29,10 +29,6 @@<br>
namespace llvm {<br>
namespace codeview {<br>
<br>
-using support::ulittle16_t;<br>
-using support::ulittle32_t;<br>
-using support::little32_t;<br>
-<br>
class SymbolRecord {<br>
protected:<br>
explicit SymbolRecord(SymbolRecordKind Kind) : Kind(Kind) {}<br>
@@ -47,181 +43,100 @@ private:<br>
// S_GPROC32, S_LPROC32, S_GPROC32_ID, S_LPROC32_ID, S_LPROC32_DPC or<br>
// S_LPROC32_DPC_ID<br>
class ProcSym : public SymbolRecord {<br>
-public:<br>
- struct Hdr {<br>
- ulittle32_t PtrParent;<br>
- ulittle32_t PtrEnd;<br>
- ulittle32_t PtrNext;<br>
- ulittle32_t CodeSize;<br>
- ulittle32_t DbgStart;<br>
- ulittle32_t DbgEnd;<br>
- TypeIndex FunctionType;<br>
- ulittle32_t CodeOffset;<br>
- ulittle16_t Segment;<br>
- uint8_t Flags; // ProcSymFlags enum<br>
- // Name: The null-terminated name follows.<br>
- };<br>
+ static constexpr uint32_t RelocationOffset = 32;<br>
<br>
+public:<br>
explicit ProcSym(SymbolRecordKind Kind) : SymbolRecord(Kind) {}<br>
- ProcSym(SymbolRecordKind Kind, uint32_t RecordOffset, const Hdr *H,<br>
- StringRef Name)<br>
- : SymbolRecord(Kind), RecordOffset(RecordOffset), Header(*H), Name(Name) {<br>
- }<br>
-<br>
- static Expected<ProcSym> deserialize(SymbolRecordKind Kind,<br>
- uint32_t RecordOffset,<br>
- msf::StreamReader &Reader) {<br>
- const Hdr *H = nullptr;<br>
- StringRef Name;<br>
- CV_DESERIALIZE(Reader, H, Name);<br>
-<br>
- return ProcSym(Kind, RecordOffset, H, Name);<br>
- }<br>
+ ProcSym(SymbolRecordKind Kind, uint32_t RecordOffset)<br>
+ : SymbolRecord(Kind), RecordOffset(RecordOffset) {}<br>
<br>
uint32_t getRelocationOffset() const {<br>
- return RecordOffset + offsetof(Hdr, CodeOffset);<br>
+ return RecordOffset + RelocationOffset;<br>
}<br>
<br>
- uint32_t RecordOffset;<br>
- Hdr Header;<br>
+ uint32_t Parent = 0;<br>
+ uint32_t End = 0;<br>
+ uint32_t Next = 0;<br>
+ uint32_t CodeSize = 0;<br>
+ uint32_t DbgStart = 0;<br>
+ uint32_t DbgEnd = 0;<br>
+ TypeIndex FunctionType;<br>
+ uint32_t CodeOffset = 0;<br>
+ uint16_t Segment = 0;<br>
+ ProcSymFlags Flags = ProcSymFlags::None;<br>
StringRef Name;<br>
+<br>
+ uint32_t RecordOffset = 0;<br>
};<br>
<br>
// S_THUNK32<br>
class Thunk32Sym : public SymbolRecord {<br>
public:<br>
- struct Hdr {<br>
- ulittle32_t Parent;<br>
- ulittle32_t End;<br>
- ulittle32_t Next;<br>
- ulittle32_t Off;<br>
- ulittle16_t Seg;<br>
- ulittle16_t Len;<br>
- uint8_t Ord; // ThunkOrdinal enumeration<br>
- // Name: The null-terminated name follows.<br>
- // Variant portion of thunk<br>
- };<br>
-<br>
explicit Thunk32Sym(SymbolRecordKind Kind) : SymbolRecord(Kind) {}<br>
- Thunk32Sym(SymbolRecordKind Kind, uint32_t RecordOffset, const Hdr *H,<br>
- StringRef Name, ArrayRef<uint8_t> VariantData)<br>
- : SymbolRecord(Kind), RecordOffset(RecordOffset), Header(*H), Name(Name),<br>
- VariantData(VariantData) {}<br>
-<br>
- static Expected<Thunk32Sym> deserialize(SymbolRecordKind Kind,<br>
- uint32_t RecordOffset,<br>
- msf::StreamReader &Reader) {<br>
- const Hdr *H = nullptr;<br>
- StringRef Name;<br>
- ArrayRef<uint8_t> VariantData;<br>
-<br>
- CV_DESERIALIZE(Reader, H, Name, CV_ARRAY_FIELD_TAIL(<wbr>VariantData));<br>
-<br>
- return Thunk32Sym(Kind, RecordOffset, H, Name, VariantData);<br>
- }<br>
+ Thunk32Sym(SymbolRecordKind Kind, uint32_t RecordOffset)<br>
+ : SymbolRecord(Kind), RecordOffset(RecordOffset) {}<br>
<br>
- uint32_t RecordOffset;<br>
- Hdr Header;<br>
+ uint32_t Parent;<br>
+ uint32_t End;<br>
+ uint32_t Next;<br>
+ uint32_t Offset;<br>
+ uint16_t Segment;<br>
+ uint16_t Length;<br>
+ ThunkOrdinal Thunk;<br>
StringRef Name;<br>
ArrayRef<uint8_t> VariantData;<br>
+<br>
+ uint32_t RecordOffset;<br>
};<br>
<br>
// S_TRAMPOLINE<br>
class TrampolineSym : public SymbolRecord {<br>
public:<br>
- struct Hdr {<br>
- ulittle16_t Type; // TrampolineType enum<br>
- ulittle16_t Size;<br>
- ulittle32_t ThunkOff;<br>
- ulittle32_t TargetOff;<br>
- ulittle16_t ThunkSection;<br>
- ulittle16_t TargetSection;<br>
- };<br>
-<br>
explicit TrampolineSym(SymbolRecordKind Kind) : SymbolRecord(Kind) {}<br>
- TrampolineSym(SymbolRecordKind Kind, uint32_t RecordOffset, const Hdr *H)<br>
- : SymbolRecord(Kind), RecordOffset(RecordOffset), Header(*H) {}<br>
-<br>
- static Expected<TrampolineSym> deserialize(SymbolRecordKind Kind,<br>
- uint32_t RecordOffset,<br>
- msf::StreamReader &Reader) {<br>
- const Hdr *H = nullptr;<br>
-<br>
- CV_DESERIALIZE(Reader, H);<br>
+ TrampolineSym(SymbolRecordKind Kind, uint32_t RecordOffset)<br>
+ : SymbolRecord(Kind), RecordOffset(RecordOffset) {}<br>
<br>
- return TrampolineSym(Kind, RecordOffset, H);<br>
- }<br>
+ TrampolineType Type;<br>
+ uint16_t Size;<br>
+ uint32_t ThunkOffset;<br>
+ uint32_t TargetOffset;<br>
+ uint16_t ThunkSection;<br>
+ uint16_t TargetSection;<br>
<br>
uint32_t RecordOffset;<br>
- Hdr Header;<br>
};<br>
<br>
// S_SECTION<br>
class SectionSym : public SymbolRecord {<br>
public:<br>
- struct Hdr {<br>
- ulittle16_t SectionNumber;<br>
- uint8_t Alignment;<br>
- uint8_t Reserved; // Must be 0<br>
- ulittle32_t Rva;<br>
- ulittle32_t Length;<br>
- ulittle32_t Characteristics;<br>
- // Name: The null-terminated name follows.<br>
- };<br>
-<br>
explicit SectionSym(SymbolRecordKind Kind) : SymbolRecord(Kind) {}<br>
- SectionSym(SymbolRecordKind Kind, uint32_t RecordOffset, const Hdr *H,<br>
- StringRef Name)<br>
- : SymbolRecord(Kind), RecordOffset(RecordOffset), Header(*H), Name(Name) {<br>
- }<br>
-<br>
- static Expected<SectionSym> deserialize(SymbolRecordKind Kind,<br>
- uint32_t RecordOffset,<br>
- msf::StreamReader &Reader) {<br>
- const Hdr *H = nullptr;<br>
- StringRef Name;<br>
-<br>
- CV_DESERIALIZE(Reader, H, Name);<br>
+ SectionSym(SymbolRecordKind Kind, uint32_t RecordOffset)<br>
+ : SymbolRecord(Kind), RecordOffset(RecordOffset) {}<br>
<br>
- return SectionSym(Kind, RecordOffset, H, Name);<br>
- }<br>
+ uint16_t SectionNumber;<br>
+ uint8_t Alignment;<br>
+ uint32_t Rva;<br>
+ uint32_t Length;<br>
+ uint32_t Characteristics;<br>
+ StringRef Name;<br>
<br>
uint32_t RecordOffset;<br>
- Hdr Header;<br>
- StringRef Name;<br>
};<br>
<br>
// S_COFFGROUP<br>
class CoffGroupSym : public SymbolRecord {<br>
public:<br>
- struct Hdr {<br>
- ulittle32_t Size;<br>
- ulittle32_t Characteristics;<br>
- ulittle32_t Offset;<br>
- ulittle16_t Segment;<br>
- // Name: The null-terminated name follows.<br>
- };<br>
-<br>
explicit CoffGroupSym(SymbolRecordKind Kind) : SymbolRecord(Kind) {}<br>
- CoffGroupSym(SymbolRecordKind Kind, uint32_t RecordOffset, const Hdr *H,<br>
- StringRef Name)<br>
- : SymbolRecord(Kind), RecordOffset(RecordOffset), Header(*H), Name(Name) {<br>
- }<br>
-<br>
- static Expected<CoffGroupSym> deserialize(SymbolRecordKind Kind,<br>
- uint32_t RecordOffset,<br>
- msf::StreamReader &Reader) {<br>
- const Hdr *H = nullptr;<br>
- StringRef Name;<br>
-<br>
- CV_DESERIALIZE(Reader, H, Name);<br>
+ CoffGroupSym(SymbolRecordKind Kind, uint32_t RecordOffset)<br>
+ : SymbolRecord(Kind), RecordOffset(RecordOffset) {}<br>
<br>
- return CoffGroupSym(Kind, RecordOffset, H, Name);<br>
- }<br>
+ uint32_t Size;<br>
+ uint32_t Characteristics;<br>
+ uint32_t Offset;<br>
+ uint16_t Segment;<br>
+ StringRef Name;<br>
<br>
uint32_t RecordOffset;<br>
- Hdr Header;<br>
- StringRef Name;<br>
};<br>
<br>
class ScopeEndSym : public SymbolRecord {<br>
@@ -230,40 +145,17 @@ public:<br>
ScopeEndSym(SymbolRecordKind Kind, uint32_t RecordOffset)<br>
: SymbolRecord(Kind), RecordOffset(RecordOffset) {}<br>
<br>
- static Expected<ScopeEndSym> deserialize(SymbolRecordKind Kind,<br>
- uint32_t RecordOffset,<br>
- msf::StreamReader &Reader) {<br>
- return ScopeEndSym(Kind, RecordOffset);<br>
- }<br>
uint32_t RecordOffset;<br>
};<br>
<br>
class CallerSym : public SymbolRecord {<br>
public:<br>
- struct Hdr {<br>
- ulittle32_t Count;<br>
- };<br>
-<br>
explicit CallerSym(SymbolRecordKind Kind) : SymbolRecord(Kind) {}<br>
- CallerSym(SymbolRecordKind Kind, uint32_t RecordOffset, const Hdr *Header,<br>
- ArrayRef<TypeIndex> Indices)<br>
- : SymbolRecord(Kind), RecordOffset(RecordOffset), Header(*Header),<br>
- Indices(Indices) {}<br>
-<br>
- static Expected<CallerSym> deserialize(SymbolRecordKind Kind,<br>
- uint32_t RecordOffset,<br>
- msf::StreamReader &Reader) {<br>
- const Hdr *Header;<br>
- ArrayRef<TypeIndex> Indices;<br>
-<br>
- CV_DESERIALIZE(Reader, Header, CV_ARRAY_FIELD_N(Indices, Header->Count));<br>
-<br>
- return CallerSym(Kind, RecordOffset, Header, Indices);<br>
- }<br>
+ CallerSym(SymbolRecordKind Kind, uint32_t RecordOffset)<br>
+ : SymbolRecord(Kind), RecordOffset(RecordOffset) {}<br>
<br>
+ std::vector<TypeIndex> Indices;<br>
uint32_t RecordOffset;<br>
- Hdr Header;<br>
- ArrayRef<TypeIndex> Indices;<br>
};<br>
<br>
struct BinaryAnnotationIterator {<br>
@@ -447,404 +339,219 @@ private:<br>
// S_INLINESITE<br>
class InlineSiteSym : public SymbolRecord {<br>
public:<br>
- struct Hdr {<br>
- ulittle32_t PtrParent;<br>
- ulittle32_t PtrEnd;<br>
- TypeIndex Inlinee;<br>
- // BinaryAnnotations<br>
- };<br>
-<br>
explicit InlineSiteSym(SymbolRecordKind Kind) : SymbolRecord(Kind) {}<br>
- InlineSiteSym(uint32_t RecordOffset, const Hdr *H,<br>
- ArrayRef<uint8_t> Annotations)<br>
+ InlineSiteSym(uint32_t RecordOffset)<br>
: SymbolRecord(SymbolRecordKind:<wbr>:InlineSiteSym),<br>
- RecordOffset(RecordOffset), Header(*H), Annotations(Annotations) {}<br>
-<br>
- static Expected<InlineSiteSym> deserialize(SymbolRecordKind Kind,<br>
- uint32_t RecordOffset,<br>
- msf::StreamReader &Reader) {<br>
- const Hdr *H = nullptr;<br>
- ArrayRef<uint8_t> Annotations;<br>
- CV_DESERIALIZE(Reader, H, CV_ARRAY_FIELD_TAIL(<wbr>Annotations));<br>
-<br>
- return InlineSiteSym(RecordOffset, H, Annotations);<br>
- }<br>
+ RecordOffset(RecordOffset) {}<br>
<br>
llvm::iterator_range<<wbr>BinaryAnnotationIterator> annotations() const {<br>
- return llvm::make_range(<wbr>BinaryAnnotationIterator(<wbr>Annotations),<br>
+ return llvm::make_range(<wbr>BinaryAnnotationIterator(<wbr>AnnotationData),<br>
BinaryAnnotationIterator());<br>
}<br>
<br>
- uint32_t RecordOffset;<br>
- Hdr Header;<br>
+ uint32_t Parent;<br>
+ uint32_t End;<br>
+ TypeIndex Inlinee;<br>
+ std::vector<uint8_t> AnnotationData;<br>
<br>
-private:<br>
- ArrayRef<uint8_t> Annotations;<br>
+ uint32_t RecordOffset;<br>
};<br>
<br>
// S_PUB32<br>
class PublicSym32 : public SymbolRecord {<br>
public:<br>
- struct Hdr {<br>
- ulittle32_t Index; // Type index, or Metadata token if a managed symbol<br>
- ulittle32_t Off;<br>
- ulittle16_t Seg;<br>
- // Name: The null-terminated name follows.<br>
- };<br>
-<br>
explicit PublicSym32(SymbolRecordKind Kind) : SymbolRecord(Kind) {}<br>
- PublicSym32(uint32_t RecordOffset, const Hdr *H, StringRef Name)<br>
- : SymbolRecord(SymbolRecordKind:<wbr>:PublicSym32), RecordOffset(RecordOffset),<br>
- Header(*H), Name(Name) {}<br>
-<br>
- static Expected<PublicSym32> deserialize(SymbolRecordKind Kind,<br>
- uint32_t RecordOffset,<br>
- msf::StreamReader &Reader) {<br>
- const Hdr *H = nullptr;<br>
- StringRef Name;<br>
- CV_DESERIALIZE(Reader, H, Name);<br>
-<br>
- return PublicSym32(RecordOffset, H, Name);<br>
- }<br>
+ explicit PublicSym32(uint32_t RecordOffset)<br>
+ : SymbolRecord(SymbolRecordKind:<wbr>:PublicSym32),<br>
+ RecordOffset(RecordOffset) {}<br>
+<br>
+ uint32_t Index;<br>
+ uint32_t Offset;<br>
+ uint16_t Segment;<br>
+ StringRef Name;<br>
<br>
uint32_t RecordOffset;<br>
- Hdr Header;<br>
- StringRef Name;<br>
};<br>
<br>
// S_REGISTER<br>
class RegisterSym : public SymbolRecord {<br>
public:<br>
- struct Hdr {<br>
- ulittle32_t Index; // Type index or Metadata token<br>
- ulittle16_t Register; // RegisterId enumeration<br>
- // Name: The null-terminated name follows.<br>
- };<br>
-<br>
explicit RegisterSym(SymbolRecordKind Kind) : SymbolRecord(Kind) {}<br>
- RegisterSym(uint32_t RecordOffset, const Hdr *H, StringRef Name)<br>
- : SymbolRecord(SymbolRecordKind:<wbr>:RegisterSym), RecordOffset(RecordOffset),<br>
- Header(*H), Name(Name) {}<br>
-<br>
- static Expected<RegisterSym> deserialize(SymbolRecordKind Kind,<br>
- uint32_t RecordOffset,<br>
- msf::StreamReader &Reader) {<br>
- const Hdr *H = nullptr;<br>
- StringRef Name;<br>
- CV_DESERIALIZE(Reader, H, Name);<br>
+ RegisterSym(uint32_t RecordOffset)<br>
+ : SymbolRecord(SymbolRecordKind:<wbr>:RegisterSym),<br>
+ RecordOffset(RecordOffset) {}<br>
<br>
- return RegisterSym(RecordOffset, H, Name);<br>
- }<br>
+ uint32_t Index;<br>
+ RegisterId Register;<br>
+ StringRef Name;<br>
<br>
uint32_t RecordOffset;<br>
- Hdr Header;<br>
- StringRef Name;<br>
};<br>
<br>
// S_PROCREF, S_LPROCREF<br>
class ProcRefSym : public SymbolRecord {<br>
public:<br>
- struct Hdr {<br>
- ulittle32_t SumName; // SUC of the name (?)<br>
- ulittle32_t SymOffset; // Offset of actual symbol in $$Symbols<br>
- ulittle16_t Mod; // Module containing the actual symbol<br>
- // Name: The null-terminated name follows.<br>
- };<br>
-<br>
explicit ProcRefSym(SymbolRecordKind Kind) : SymbolRecord(Kind) {}<br>
- ProcRefSym(uint32_t RecordOffset, const Hdr *H, StringRef Name)<br>
- : SymbolRecord(SymbolRecordKind:<wbr>:ProcRefSym), RecordOffset(RecordOffset),<br>
- Header(*H), Name(Name) {}<br>
-<br>
- static Expected<ProcRefSym> deserialize(SymbolRecordKind Kind,<br>
- uint32_t RecordOffset,<br>
- msf::StreamReader &Reader) {<br>
- const Hdr *H = nullptr;<br>
- StringRef Name;<br>
- CV_DESERIALIZE(Reader, H, Name);<br>
-<br>
- return ProcRefSym(RecordOffset, H, Name);<br>
+ explicit ProcRefSym(uint32_t RecordOffset)<br>
+ : SymbolRecord(SymbolRecordKind:<wbr>:ProcRefSym), RecordOffset(RecordOffset) {<br>
}<br>
<br>
- uint32_t RecordOffset;<br>
- Hdr Header;<br>
+ uint32_t SumName;<br>
+ uint32_t SymOffset;<br>
+ uint16_t Module;<br>
StringRef Name;<br>
+<br>
+ uint32_t RecordOffset;<br>
};<br>
<br>
// S_LOCAL<br>
class LocalSym : public SymbolRecord {<br>
public:<br>
- struct Hdr {<br>
- TypeIndex Type;<br>
- ulittle16_t Flags; // LocalSymFlags enum<br>
- // Name: The null-terminated name follows.<br>
- };<br>
-<br>
explicit LocalSym(SymbolRecordKind Kind) : SymbolRecord(Kind) {}<br>
- LocalSym(uint32_t RecordOffset, const Hdr *H, StringRef Name)<br>
- : SymbolRecord(SymbolRecordKind:<wbr>:LocalSym), RecordOffset(RecordOffset),<br>
- Header(*H), Name(Name) {}<br>
-<br>
- static Expected<LocalSym> deserialize(SymbolRecordKind Kind,<br>
- uint32_t RecordOffset,<br>
- msf::StreamReader &Reader) {<br>
- const Hdr *H = nullptr;<br>
- StringRef Name;<br>
- CV_DESERIALIZE(Reader, H, Name);<br>
+ explicit LocalSym(uint32_t RecordOffset)<br>
+ : SymbolRecord(SymbolRecordKind:<wbr>:LocalSym), RecordOffset(RecordOffset) {}<br>
<br>
- return LocalSym(RecordOffset, H, Name);<br>
- }<br>
+ TypeIndex Type;<br>
+ LocalSymFlags Flags;<br>
+ StringRef Name;<br>
<br>
uint32_t RecordOffset;<br>
- Hdr Header;<br>
- StringRef Name;<br>
};<br>
<br>
struct LocalVariableAddrRange {<br>
- ulittle32_t OffsetStart;<br>
- ulittle16_t ISectStart;<br>
- ulittle16_t Range;<br>
+ uint32_t OffsetStart;<br>
+ uint16_t ISectStart;<br>
+ uint16_t Range;<br>
};<br>
<br>
struct LocalVariableAddrGap {<br>
- ulittle16_t GapStartOffset;<br>
- ulittle16_t Range;<br>
+ uint16_t GapStartOffset;<br>
+ uint16_t Range;<br>
};<br>
<br>
enum : uint16_t { MaxDefRange = 0xf000 };<br>
<br>
// S_DEFRANGE<br>
class DefRangeSym : public SymbolRecord {<br>
-public:<br>
- struct Hdr {<br>
- ulittle32_t Program;<br>
- LocalVariableAddrRange Range;<br>
- // LocalVariableAddrGap Gaps[];<br>
- };<br>
+ static constexpr uint32_t RelocationOffset = 8;<br>
<br>
+public:<br>
explicit DefRangeSym(SymbolRecordKind Kind) : SymbolRecord(Kind) {}<br>
- DefRangeSym(uint32_t RecordOffset, const Hdr *H,<br>
- ArrayRef<LocalVariableAddrGap> Gaps)<br>
- : SymbolRecord(SymbolRecordKind:<wbr>:DefRangeSym), RecordOffset(RecordOffset),<br>
- Header(*H), Gaps(Gaps) {}<br>
-<br>
- static Expected<DefRangeSym> deserialize(SymbolRecordKind Kind,<br>
- uint32_t RecordOffset,<br>
- msf::StreamReader &Reader) {<br>
- const Hdr *H = nullptr;<br>
- ArrayRef<LocalVariableAddrGap> Gaps;<br>
- CV_DESERIALIZE(Reader, H, CV_ARRAY_FIELD_TAIL(Gaps));<br>
-<br>
- return DefRangeSym(RecordOffset, H, Gaps);<br>
- }<br>
+ explicit DefRangeSym(uint32_t RecordOffset)<br>
+ : SymbolRecord(SymbolRecordKind:<wbr>:DefRangeSym),<br>
+ RecordOffset(RecordOffset) {}<br>
<br>
uint32_t getRelocationOffset() const {<br>
- return RecordOffset + offsetof(Hdr, Range);<br>
+ return RecordOffset + RelocationOffset;<br>
}<br>
<br>
+ uint32_t Program;<br>
+ LocalVariableAddrRange Range;<br>
+ std::vector<<wbr>LocalVariableAddrGap> Gaps;<br>
+<br>
uint32_t RecordOffset;<br>
- Hdr Header;<br>
- ArrayRef<LocalVariableAddrGap> Gaps;<br>
};<br>
<br>
// S_DEFRANGE_SUBFIELD<br>
class DefRangeSubfieldSym : public SymbolRecord {<br>
+ static constexpr uint32_t RelocationOffset = 12;<br>
+<br>
public:<br>
- struct Hdr {<br>
- ulittle32_t Program;<br>
- ulittle16_t OffsetInParent;<br>
- LocalVariableAddrRange Range;<br>
- // LocalVariableAddrGap Gaps[];<br>
- };<br>
explicit DefRangeSubfieldSym(<wbr>SymbolRecordKind Kind) : SymbolRecord(Kind) {}<br>
- DefRangeSubfieldSym(uint32_t RecordOffset, const Hdr *H,<br>
- ArrayRef<LocalVariableAddrGap> Gaps)<br>
+ DefRangeSubfieldSym(uint32_t RecordOffset)<br>
: SymbolRecord(SymbolRecordKind:<wbr>:DefRangeSubfieldSym),<br>
- RecordOffset(RecordOffset), Header(*H), Gaps(Gaps) {}<br>
-<br>
- static Expected<DefRangeSubfieldSym> deserialize(SymbolRecordKind Kind,<br>
- uint32_t RecordOffset,<br>
- msf::StreamReader &Reader) {<br>
- const Hdr *H = nullptr;<br>
- ArrayRef<LocalVariableAddrGap> Gaps;<br>
- CV_DESERIALIZE(Reader, H, CV_ARRAY_FIELD_TAIL(Gaps));<br>
-<br>
- return DefRangeSubfieldSym(<wbr>RecordOffset, H, Gaps);<br>
- }<br>
+ RecordOffset(RecordOffset) {}<br>
<br>
uint32_t getRelocationOffset() const {<br>
- return RecordOffset + offsetof(Hdr, Range);<br>
+ return RecordOffset + RelocationOffset;<br>
}<br>
<br>
+ uint32_t Program;<br>
+ uint16_t OffsetInParent;<br>
+ LocalVariableAddrRange Range;<br>
+ std::vector<<wbr>LocalVariableAddrGap> Gaps;<br>
+<br>
uint32_t RecordOffset;<br>
- Hdr Header;<br>
- ArrayRef<LocalVariableAddrGap> Gaps;<br>
};<br>
<br>
// S_DEFRANGE_REGISTER<br>
class DefRangeRegisterSym : public SymbolRecord {<br>
public:<br>
- struct Hdr {<br>
+ struct Header {<br>
ulittle16_t Register;<br>
ulittle16_t MayHaveNoName;<br>
- LocalVariableAddrRange Range;<br>
- // LocalVariableAddrGap Gaps[];<br>
};<br>
-<br>
explicit DefRangeRegisterSym(<wbr>SymbolRecordKind Kind) : SymbolRecord(Kind) {}<br>
- DefRangeRegisterSym(uint32_t RecordOffset, const Hdr *H,<br>
- ArrayRef<LocalVariableAddrGap> Gaps)<br>
+ DefRangeRegisterSym(uint32_t RecordOffset)<br>
: SymbolRecord(SymbolRecordKind:<wbr>:DefRangeRegisterSym),<br>
- RecordOffset(RecordOffset), Header(*H), Gaps(Gaps) {}<br>
+ RecordOffset(RecordOffset) {}<br>
<br>
- DefRangeRegisterSym(uint16_t Register, uint16_t MayHaveNoName,<br>
- ArrayRef<LocalVariableAddrGap> Gaps)<br>
- : SymbolRecord(SymbolRecordKind:<wbr>:DefRangeRegisterSym), RecordOffset(0),<br>
- Gaps(Gaps) {<br>
- Header.Register = Register;<br>
- Header.MayHaveNoName = MayHaveNoName;<br>
- Header.Range = {};<br>
- }<br>
-<br>
- static Expected<DefRangeRegisterSym> deserialize(SymbolRecordKind Kind,<br>
- uint32_t RecordOffset,<br>
- msf::StreamReader &Reader) {<br>
- const Hdr *H = nullptr;<br>
- ArrayRef<LocalVariableAddrGap> Gaps;<br>
- CV_DESERIALIZE(Reader, H, CV_ARRAY_FIELD_TAIL(Gaps));<br>
+ uint32_t getRelocationOffset() const { return RecordOffset + sizeof(Header); }<br>
<br>
- return DefRangeRegisterSym(<wbr>RecordOffset, H, Gaps);<br>
- }<br>
-<br>
- uint32_t getRelocationOffset() const {<br>
- return RecordOffset + offsetof(Hdr, Range);<br>
- }<br>
+ Header Hdr;<br>
+ LocalVariableAddrRange Range;<br>
+ std::vector<<wbr>LocalVariableAddrGap> Gaps;<br>
<br>
uint32_t RecordOffset;<br>
- Hdr Header;<br>
- ArrayRef<LocalVariableAddrGap> Gaps;<br>
};<br>
<br>
// S_DEFRANGE_SUBFIELD_REGISTER<br>
class DefRangeSubfieldRegisterSym : public SymbolRecord {<br>
public:<br>
- struct Hdr {<br>
- ulittle16_t Register; // Register to which the variable is relative<br>
+ struct Header {<br>
+ ulittle16_t Register;<br>
ulittle16_t MayHaveNoName;<br>
ulittle32_t OffsetInParent;<br>
- LocalVariableAddrRange Range;<br>
- // LocalVariableAddrGap Gaps[];<br>
};<br>
-<br>
explicit DefRangeSubfieldRegisterSym(<wbr>SymbolRecordKind Kind)<br>
: SymbolRecord(Kind) {}<br>
- DefRangeSubfieldRegisterSym(<wbr>uint32_t RecordOffset, const Hdr *H,<br>
- ArrayRef<LocalVariableAddrGap> Gaps)<br>
+ DefRangeSubfieldRegisterSym(<wbr>uint32_t RecordOffset)<br>
: SymbolRecord(SymbolRecordKind:<wbr>:DefRangeSubfieldRegisterSym),<br>
- RecordOffset(RecordOffset), Header(*H), Gaps(Gaps) {}<br>
+ RecordOffset(RecordOffset) {}<br>
<br>
- DefRangeSubfieldRegisterSym(<wbr>uint16_t Register, uint16_t MayHaveNoName,<br>
- uint32_t OffsetInParent,<br>
- ArrayRef<LocalVariableAddrGap> Gaps)<br>
- : SymbolRecord(SymbolRecordKind:<wbr>:DefRangeSubfieldRegisterSym),<br>
- RecordOffset(0), Gaps(Gaps) {<br>
- Header.Register = Register;<br>
- Header.MayHaveNoName = MayHaveNoName;<br>
- Header.OffsetInParent = OffsetInParent;<br>
- Header.Range = {};<br>
- }<br>
-<br>
- static Expected<<wbr>DefRangeSubfieldRegisterSym><br>
- deserialize(SymbolRecordKind Kind, uint32_t RecordOffset,<br>
- msf::StreamReader &Reader) {<br>
- const Hdr *H = nullptr;<br>
- ArrayRef<LocalVariableAddrGap> Gaps;<br>
- CV_DESERIALIZE(Reader, H, CV_ARRAY_FIELD_TAIL(Gaps));<br>
-<br>
- return DefRangeSubfieldRegisterSym(<wbr>RecordOffset, H, Gaps);<br>
- }<br>
+ uint32_t getRelocationOffset() const { return RecordOffset + sizeof(Header); }<br>
<br>
- uint32_t getRelocationOffset() const {<br>
- return RecordOffset + offsetof(Hdr, Range);<br>
- }<br>
+ Header Hdr;<br>
+ LocalVariableAddrRange Range;<br>
+ std::vector<<wbr>LocalVariableAddrGap> Gaps;<br>
<br>
uint32_t RecordOffset;<br>
- Hdr Header;<br>
- ArrayRef<LocalVariableAddrGap> Gaps;<br>
};<br>
<br>
// S_DEFRANGE_FRAMEPOINTER_REL<br>
class DefRangeFramePointerRelSym : public SymbolRecord {<br>
-public:<br>
- struct Hdr {<br>
- little32_t Offset; // Offset from the frame pointer register<br>
- LocalVariableAddrRange Range;<br>
- // LocalVariableAddrGap Gaps[];<br>
- };<br>
+ static constexpr uint32_t RelocationOffset = 8;<br>
<br>
+public:<br>
explicit DefRangeFramePointerRelSym(<wbr>SymbolRecordKind Kind)<br>
: SymbolRecord(Kind) {}<br>
- DefRangeFramePointerRelSym(<wbr>uint32_t RecordOffset, const Hdr *H,<br>
- ArrayRef<LocalVariableAddrGap> Gaps)<br>
+ DefRangeFramePointerRelSym(<wbr>uint32_t RecordOffset)<br>
: SymbolRecord(SymbolRecordKind:<wbr>:DefRangeFramePointerRelSym),<br>
- RecordOffset(RecordOffset), Header(*H), Gaps(Gaps) {}<br>
-<br>
- static Expected<<wbr>DefRangeFramePointerRelSym><br>
- deserialize(SymbolRecordKind Kind, uint32_t RecordOffset,<br>
- msf::StreamReader &Reader) {<br>
- const Hdr *H = nullptr;<br>
- ArrayRef<LocalVariableAddrGap> Gaps;<br>
- CV_DESERIALIZE(Reader, H, CV_ARRAY_FIELD_TAIL(Gaps));<br>
-<br>
- return DefRangeFramePointerRelSym(<wbr>RecordOffset, H, Gaps);<br>
- }<br>
+ RecordOffset(RecordOffset) {}<br>
<br>
uint32_t getRelocationOffset() const {<br>
- return RecordOffset + offsetof(Hdr, Range);<br>
+ return RecordOffset + RelocationOffset;<br>
}<br>
<br>
+ int32_t Offset;<br>
+ LocalVariableAddrRange Range;<br>
+ std::vector<<wbr>LocalVariableAddrGap> Gaps;<br>
+<br>
uint32_t RecordOffset;<br>
- Hdr Header;<br>
- ArrayRef<LocalVariableAddrGap> Gaps;<br>
};<br>
<br>
// S_DEFRANGE_REGISTER_REL<br>
class DefRangeRegisterRelSym : public SymbolRecord {<br>
public:<br>
- struct Hdr {<br>
- ulittle16_t BaseRegister;<br>
+ struct Header {<br>
+ ulittle16_t Register;<br>
ulittle16_t Flags;<br>
little32_t BasePointerOffset;<br>
- LocalVariableAddrRange Range;<br>
- // LocalVariableAddrGap Gaps[];<br>
};<br>
-<br>
explicit DefRangeRegisterRelSym(<wbr>SymbolRecordKind Kind) : SymbolRecord(Kind) {}<br>
- DefRangeRegisterRelSym(uint32_<wbr>t RecordOffset, const Hdr *H,<br>
- ArrayRef<LocalVariableAddrGap> Gaps)<br>
+ explicit DefRangeRegisterRelSym(uint32_<wbr>t RecordOffset)<br>
: SymbolRecord(SymbolRecordKind:<wbr>:DefRangeRegisterRelSym),<br>
- RecordOffset(RecordOffset), Header(*H), Gaps(Gaps) {}<br>
-<br>
- DefRangeRegisterRelSym(uint16_<wbr>t BaseRegister, uint16_t Flags,<br>
- int32_t BasePointerOffset,<br>
- ArrayRef<LocalVariableAddrGap> Gaps)<br>
- : SymbolRecord(SymbolRecordKind:<wbr>:DefRangeRegisterRelSym), RecordOffset(0),<br>
- Gaps(Gaps) {<br>
- Header.BaseRegister = BaseRegister;<br>
- Header.Flags = Flags;<br>
- Header.BasePointerOffset = BasePointerOffset;<br>
- Header.Range = {};<br>
- }<br>
-<br>
- static Expected<<wbr>DefRangeRegisterRelSym><br>
- deserialize(SymbolRecordKind Kind, uint32_t RecordOffset,<br>
- msf::StreamReader &Reader) {<br>
- const Hdr *H = nullptr;<br>
- ArrayRef<LocalVariableAddrGap> Gaps;<br>
- CV_DESERIALIZE(Reader, H, CV_ARRAY_FIELD_TAIL(Gaps));<br>
-<br>
- return DefRangeRegisterRelSym(<wbr>RecordOffset, H, Gaps);<br>
- }<br>
+ RecordOffset(RecordOffset) {}<br>
<br>
// The flags implement this notional bitfield:<br>
// uint16_t IsSubfield : 1;<br>
@@ -855,642 +562,379 @@ public:<br>
OffsetInParentShift = 4,<br>
};<br>
<br>
- bool hasSpilledUDTMember() const { return Header.Flags & IsSubfieldFlag; }<br>
- uint16_t offsetInParent() const { return Header.Flags >> OffsetInParentShift; }<br>
+ bool hasSpilledUDTMember() const { return Hdr.Flags & IsSubfieldFlag; }<br>
+ uint16_t offsetInParent() const { return Hdr.Flags >> OffsetInParentShift; }<br>
<br>
- uint32_t getRelocationOffset() const {<br>
- return RecordOffset + offsetof(Hdr, Range);<br>
- }<br>
+ uint32_t getRelocationOffset() const { return RecordOffset + sizeof(Header); }<br>
+<br>
+ Header Hdr;<br>
+ LocalVariableAddrRange Range;<br>
+ std::vector<<wbr>LocalVariableAddrGap> Gaps;<br>
<br>
uint32_t RecordOffset;<br>
- Hdr Header;<br>
- ArrayRef<LocalVariableAddrGap> Gaps;<br>
};<br>
<br>
// S_DEFRANGE_FRAMEPOINTER_REL_<wbr>FULL_SCOPE<br>
class DefRangeFramePointerRelFullSco<wbr>peSym : public SymbolRecord {<br>
public:<br>
- struct Hdr {<br>
- little32_t Offset; // Offset from the frame pointer register<br>
- };<br>
-<br>
explicit DefRangeFramePointerRelFullSco<wbr>peSym(SymbolRecordKind Kind)<br>
: SymbolRecord(Kind) {}<br>
- DefRangeFramePointerRelFullSco<wbr>peSym(uint32_t RecordOffset, const Hdr *H)<br>
+ explicit DefRangeFramePointerRelFullSco<wbr>peSym(uint32_t RecordOffset)<br>
: SymbolRecord(SymbolRecordKind:<wbr>:<wbr>DefRangeFramePointerRelFullSco<wbr>peSym),<br>
- RecordOffset(RecordOffset), Header(*H) {}<br>
+ RecordOffset(RecordOffset) {}<br>
<br>
- static Expected<<wbr>DefRangeFramePointerRelFullSco<wbr>peSym><br>
- deserialize(SymbolRecordKind Kind, uint32_t RecordOffset,<br>
- msf::StreamReader &Reader) {<br>
- const Hdr *H = nullptr;<br>
- CV_DESERIALIZE(Reader, H);<br>
-<br>
- return DefRangeFramePointerRelFullSco<wbr>peSym(RecordOffset, H);<br>
- }<br>
+ int32_t Offset;<br>
<br>
uint32_t RecordOffset;<br>
- Hdr Header;<br>
};<br>
<br>
// S_BLOCK32<br>
class BlockSym : public SymbolRecord {<br>
-public:<br>
- struct Hdr {<br>
- ulittle32_t PtrParent;<br>
- ulittle32_t PtrEnd;<br>
- ulittle32_t CodeSize;<br>
- ulittle32_t CodeOffset;<br>
- ulittle16_t Segment;<br>
- // Name: The null-terminated name follows.<br>
- };<br>
+ static constexpr uint32_t RelocationOffset = 16;<br>
<br>
+public:<br>
explicit BlockSym(SymbolRecordKind Kind) : SymbolRecord(Kind) {}<br>
- BlockSym(uint32_t RecordOffset, const Hdr *H, StringRef Name)<br>
- : SymbolRecord(SymbolRecordKind:<wbr>:BlockSym), RecordOffset(RecordOffset),<br>
- Header(*H), Name(Name) {}<br>
-<br>
- static Expected<BlockSym> deserialize(SymbolRecordKind Kind,<br>
- uint32_t RecordOffset,<br>
- msf::StreamReader &Reader) {<br>
- const Hdr *H = nullptr;<br>
- StringRef Name;<br>
- CV_DESERIALIZE(Reader, H, Name);<br>
-<br>
- return BlockSym(RecordOffset, H, Name);<br>
- }<br>
+ explicit BlockSym(uint32_t RecordOffset)<br>
+ : SymbolRecord(SymbolRecordKind:<wbr>:BlockSym), RecordOffset(RecordOffset) {}<br>
<br>
uint32_t getRelocationOffset() const {<br>
- return RecordOffset + offsetof(Hdr, CodeOffset);<br>
+ return RecordOffset + RelocationOffset;<br>
}<br>
<br>
- uint32_t RecordOffset;<br>
- Hdr Header;<br>
+ uint32_t Parent;<br>
+ uint32_t End;<br>
+ uint32_t CodeSize;<br>
+ uint32_t CodeOffset;<br>
+ uint16_t Segment;<br>
StringRef Name;<br>
+<br>
+ uint32_t RecordOffset;<br>
};<br>
<br>
// S_LABEL32<br>
class LabelSym : public SymbolRecord {<br>
-public:<br>
- struct Hdr {<br>
- ulittle32_t CodeOffset;<br>
- ulittle16_t Segment;<br>
- uint8_t Flags; // CV_PROCFLAGS<br>
- // Name: The null-terminated name follows.<br>
- };<br>
+ static constexpr uint32_t RelocationOffset = 4;<br>
<br>
+public:<br>
explicit LabelSym(SymbolRecordKind Kind) : SymbolRecord(Kind) {}<br>
- LabelSym(uint32_t RecordOffset, const Hdr *H, StringRef Name)<br>
- : SymbolRecord(SymbolRecordKind:<wbr>:LabelSym), RecordOffset(RecordOffset),<br>
- Header(*H), Name(Name) {}<br>
-<br>
- static Expected<LabelSym> deserialize(SymbolRecordKind Kind,<br>
- uint32_t RecordOffset,<br>
- msf::StreamReader &Reader) {<br>
- const Hdr *H = nullptr;<br>
- StringRef Name;<br>
- CV_DESERIALIZE(Reader, H, Name);<br>
-<br>
- return LabelSym(RecordOffset, H, Name);<br>
- }<br>
+ explicit LabelSym(uint32_t RecordOffset)<br>
+ : SymbolRecord(SymbolRecordKind:<wbr>:LabelSym), RecordOffset(RecordOffset) {}<br>
<br>
uint32_t getRelocationOffset() const {<br>
- return RecordOffset + offsetof(Hdr, CodeOffset);<br>
+ return RecordOffset + RelocationOffset;<br>
}<br>
<br>
- uint32_t RecordOffset;<br>
- Hdr Header;<br>
+ uint32_t CodeOffset;<br>
+ uint16_t Segment;<br>
+ ProcSymFlags Flags;<br>
StringRef Name;<br>
+<br>
+ uint32_t RecordOffset;<br>
};<br>
<br>
// S_OBJNAME<br>
class ObjNameSym : public SymbolRecord {<br>
public:<br>
- struct Hdr {<br>
- ulittle32_t Signature;<br>
- // Name: The null-terminated name follows.<br>
- };<br>
-<br>
explicit ObjNameSym(SymbolRecordKind Kind) : SymbolRecord(Kind) {}<br>
- ObjNameSym(uint32_t RecordOffset, const Hdr *H, StringRef Name)<br>
- : SymbolRecord(SymbolRecordKind:<wbr>:ObjNameSym), RecordOffset(RecordOffset),<br>
- Header(*H), Name(Name) {}<br>
-<br>
- static Expected<ObjNameSym> deserialize(SymbolRecordKind Kind,<br>
- uint32_t RecordOffset,<br>
- msf::StreamReader &Reader) {<br>
- const Hdr *H = nullptr;<br>
- StringRef Name;<br>
- CV_DESERIALIZE(Reader, H, Name);<br>
-<br>
- return ObjNameSym(RecordOffset, H, Name);<br>
+ ObjNameSym(uint32_t RecordOffset)<br>
+ : SymbolRecord(SymbolRecordKind:<wbr>:ObjNameSym), RecordOffset(RecordOffset) {<br>
}<br>
<br>
- uint32_t RecordOffset;<br>
- Hdr Header;<br>
+ uint32_t Signature;<br>
StringRef Name;<br>
+<br>
+ uint32_t RecordOffset;<br>
};<br>
<br>
// S_ENVBLOCK<br>
class EnvBlockSym : public SymbolRecord {<br>
public:<br>
- struct Hdr {<br>
- uint8_t Reserved;<br>
- // Sequence of zero terminated strings.<br>
- };<br>
-<br>
explicit EnvBlockSym(SymbolRecordKind Kind) : SymbolRecord(Kind) {}<br>
- EnvBlockSym(uint32_t RecordOffset, const Hdr *H,<br>
- const std::vector<StringRef> &Fields)<br>
- : SymbolRecord(SymbolRecordKind:<wbr>:EnvBlockSym), RecordOffset(RecordOffset),<br>
- Header(*H), Fields(Fields) {}<br>
-<br>
- static Expected<EnvBlockSym> deserialize(SymbolRecordKind Kind,<br>
- uint32_t RecordOffset,<br>
- msf::StreamReader &Reader) {<br>
- const Hdr *H = nullptr;<br>
- std::vector<StringRef> Fields;<br>
- CV_DESERIALIZE(Reader, H, CV_STRING_ARRAY_NULL_TERM(<wbr>Fields));<br>
+ EnvBlockSym(uint32_t RecordOffset)<br>
+ : SymbolRecord(SymbolRecordKind:<wbr>:EnvBlockSym),<br>
+ RecordOffset(RecordOffset) {}<br>
<br>
- return EnvBlockSym(RecordOffset, H, Fields);<br>
- }<br>
+ std::vector<StringRef> Fields;<br>
<br>
uint32_t RecordOffset;<br>
- Hdr Header;<br>
- std::vector<StringRef> Fields;<br>
};<br>
<br>
// S_EXPORT<br>
class ExportSym : public SymbolRecord {<br>
public:<br>
- struct Hdr {<br>
- ulittle16_t Ordinal;<br>
- ulittle16_t Flags; // ExportFlags<br>
- // Name: The null-terminated name follows.<br>
- };<br>
-<br>
explicit ExportSym(SymbolRecordKind Kind) : SymbolRecord(Kind) {}<br>
- ExportSym(uint32_t RecordOffset, const Hdr *H, StringRef Name)<br>
- : SymbolRecord(SymbolRecordKind:<wbr>:ExportSym), RecordOffset(RecordOffset),<br>
- Header(*H), Name(Name) {}<br>
-<br>
- static Expected<ExportSym> deserialize(SymbolRecordKind Kind,<br>
- uint32_t RecordOffset,<br>
- msf::StreamReader &Reader) {<br>
- const Hdr *H = nullptr;<br>
- StringRef Name;<br>
- CV_DESERIALIZE(Reader, H, Name);<br>
+ ExportSym(uint32_t RecordOffset)<br>
+ : SymbolRecord(SymbolRecordKind:<wbr>:ExportSym), RecordOffset(RecordOffset) {}<br>
<br>
- return ExportSym(RecordOffset, H, Name);<br>
- }<br>
+ uint16_t Ordinal;<br>
+ ExportFlags Flags;<br>
+ StringRef Name;<br>
<br>
uint32_t RecordOffset;<br>
- Hdr Header;<br>
- StringRef Name;<br>
};<br>
<br>
// S_FILESTATIC<br>
class FileStaticSym : public SymbolRecord {<br>
public:<br>
- struct Hdr {<br>
- ulittle32_t Index; // Type Index<br>
- ulittle32_t ModFilenameOffset; // Index of mod filename in string table<br>
- ulittle16_t Flags; // LocalSymFlags enum<br>
- // Name: The null-terminated name follows.<br>
- };<br>
-<br>
explicit FileStaticSym(SymbolRecordKind Kind) : SymbolRecord(Kind) {}<br>
- FileStaticSym(uint32_t RecordOffset, const Hdr *H, StringRef Name)<br>
+ FileStaticSym(uint32_t RecordOffset)<br>
: SymbolRecord(SymbolRecordKind:<wbr>:FileStaticSym),<br>
- RecordOffset(RecordOffset), Header(*H), Name(Name) {}<br>
-<br>
- static Expected<FileStaticSym> deserialize(SymbolRecordKind Kind,<br>
- uint32_t RecordOffset,<br>
- msf::StreamReader &Reader) {<br>
- const Hdr *H = nullptr;<br>
- StringRef Name;<br>
- CV_DESERIALIZE(Reader, H, Name);<br>
+ RecordOffset(RecordOffset) {}<br>
<br>
- return FileStaticSym(RecordOffset, H, Name);<br>
- }<br>
+ uint32_t Index;<br>
+ uint32_t ModFilenameOffset;<br>
+ LocalSymFlags Flags;<br>
+ StringRef Name;<br>
<br>
uint32_t RecordOffset;<br>
- Hdr Header;<br>
- StringRef Name;<br>
};<br>
<br>
// S_COMPILE2<br>
class Compile2Sym : public SymbolRecord {<br>
public:<br>
- struct Hdr {<br>
- ulittle32_t flags; // CompileSym2Flags enum<br>
- uint8_t getLanguage() const { return flags & 0xFF; }<br>
- unsigned short Machine; // CPUType enum<br>
- unsigned short VersionFrontendMajor;<br>
- unsigned short VersionFrontendMinor;<br>
- unsigned short VersionFrontendBuild;<br>
- unsigned short VersionBackendMajor;<br>
- unsigned short VersionBackendMinor;<br>
- unsigned short VersionBackendBuild;<br>
- // Version: The null-terminated version string follows.<br>
- // Optional block of zero terminated strings terminated with a double zero.<br>
- };<br>
-<br>
explicit Compile2Sym(SymbolRecordKind Kind) : SymbolRecord(Kind) {}<br>
- Compile2Sym(uint32_t RecordOffset, const Hdr *H, StringRef Version)<br>
- : SymbolRecord(SymbolRecordKind:<wbr>:Compile2Sym), RecordOffset(RecordOffset),<br>
- Header(*H), Version(Version) {}<br>
-<br>
- static Expected<Compile2Sym> deserialize(SymbolRecordKind Kind,<br>
- uint32_t RecordOffset,<br>
- msf::StreamReader &Reader) {<br>
- const Hdr *H = nullptr;<br>
- StringRef Version;<br>
- CV_DESERIALIZE(Reader, H, Version);<br>
+ Compile2Sym(uint32_t RecordOffset)<br>
+ : SymbolRecord(SymbolRecordKind:<wbr>:Compile2Sym),<br>
+ RecordOffset(RecordOffset) {}<br>
+<br>
+ CompileSym2Flags Flags;<br>
+ CPUType Machine;<br>
+ uint16_t VersionFrontendMajor;<br>
+ uint16_t VersionFrontendMinor;<br>
+ uint16_t VersionFrontendBuild;<br>
+ uint16_t VersionBackendMajor;<br>
+ uint16_t VersionBackendMinor;<br>
+ uint16_t VersionBackendBuild;<br>
+ StringRef Version;<br>
+ std::vector<StringRef> ExtraStrings;<br>
<br>
- return Compile2Sym(RecordOffset, H, Version);<br>
- }<br>
+ uint8_t getLanguage() const { return static_cast<uint32_t>(Flags) & 0xFF; }<br>
+ uint32_t getFlags() const { return static_cast<uint32_t>(Flags) & ~0xFF; }<br>
<br>
uint32_t RecordOffset;<br>
- Hdr Header;<br>
- StringRef Version;<br>
};<br>
<br>
// S_COMPILE3<br>
class Compile3Sym : public SymbolRecord {<br>
public:<br>
- struct Hdr {<br>
- ulittle32_t flags; // CompileSym3Flags enum<br>
- uint8_t getLanguage() const { return flags & 0xff; }<br>
- ulittle16_t Machine; // CPUType enum<br>
- ulittle16_t VersionFrontendMajor;<br>
- ulittle16_t VersionFrontendMinor;<br>
- ulittle16_t VersionFrontendBuild;<br>
- ulittle16_t VersionFrontendQFE;<br>
- ulittle16_t VersionBackendMajor;<br>
- ulittle16_t VersionBackendMinor;<br>
- ulittle16_t VersionBackendBuild;<br>
- ulittle16_t VersionBackendQFE;<br>
- // VersionString: The null-terminated version string follows.<br>
- };<br>
-<br>
explicit Compile3Sym(SymbolRecordKind Kind) : SymbolRecord(Kind) {}<br>
- Compile3Sym(uint32_t RecordOffset, const Hdr *H, StringRef Version)<br>
- : SymbolRecord(SymbolRecordKind:<wbr>:Compile3Sym), RecordOffset(RecordOffset),<br>
- Header(*H), Version(Version) {}<br>
-<br>
- static Expected<Compile3Sym> deserialize(SymbolRecordKind Kind,<br>
- uint32_t RecordOffset,<br>
- msf::StreamReader &Reader) {<br>
- const Hdr *H = nullptr;<br>
- StringRef Version;<br>
- CV_DESERIALIZE(Reader, H, Version);<br>
+ Compile3Sym(uint32_t RecordOffset)<br>
+ : SymbolRecord(SymbolRecordKind:<wbr>:Compile3Sym),<br>
+ RecordOffset(RecordOffset) {}<br>
+<br>
+ CompileSym3Flags Flags;<br>
+ CPUType Machine;<br>
+ uint16_t VersionFrontendMajor;<br>
+ uint16_t VersionFrontendMinor;<br>
+ uint16_t VersionFrontendBuild;<br>
+ uint16_t VersionFrontendQFE;<br>
+ uint16_t VersionBackendMajor;<br>
+ uint16_t VersionBackendMinor;<br>
+ uint16_t VersionBackendBuild;<br>
+ uint16_t VersionBackendQFE;<br>
+ StringRef Version;<br>
<br>
- return Compile3Sym(RecordOffset, H, Version);<br>
- }<br>
+ uint8_t getLanguage() const { return static_cast<uint32_t>(Flags) & 0xFF; }<br>
+ uint32_t getFlags() const { return static_cast<uint32_t>(Flags) & ~0xFF; }<br>
<br>
uint32_t RecordOffset;<br>
- Hdr Header;<br>
- StringRef Version;<br>
};<br>
<br>
// S_FRAMEPROC<br>
class FrameProcSym : public SymbolRecord {<br>
public:<br>
- struct Hdr {<br>
- ulittle32_t TotalFrameBytes;<br>
- ulittle32_t PaddingFrameBytes;<br>
- ulittle32_t OffsetToPadding;<br>
- ulittle32_t BytesOfCalleeSavedRegisters;<br>
- ulittle32_t OffsetOfExceptionHandler;<br>
- ulittle16_t SectionIdOfExceptionHandler;<br>
- ulittle32_t Flags;<br>
- };<br>
-<br>
explicit FrameProcSym(SymbolRecordKind Kind) : SymbolRecord(Kind) {}<br>
- FrameProcSym(uint32_t RecordOffset, const Hdr *H)<br>
+ explicit FrameProcSym(uint32_t RecordOffset)<br>
: SymbolRecord(SymbolRecordKind:<wbr>:FrameProcSym),<br>
- RecordOffset(RecordOffset), Header(*H) {}<br>
-<br>
- static Expected<FrameProcSym> deserialize(SymbolRecordKind Kind,<br>
- uint32_t RecordOffset,<br>
- msf::StreamReader &Reader) {<br>
- const Hdr *H = nullptr;<br>
- CV_DESERIALIZE(Reader, H);<br>
+ RecordOffset(RecordOffset) {}<br>
<br>
- return FrameProcSym(RecordOffset, H);<br>
- }<br>
+ uint32_t TotalFrameBytes;<br>
+ uint32_t PaddingFrameBytes;<br>
+ uint32_t OffsetToPadding;<br>
+ uint32_t BytesOfCalleeSavedRegisters;<br>
+ uint32_t OffsetOfExceptionHandler;<br>
+ uint16_t SectionIdOfExceptionHandler;<br>
+ FrameProcedureOptions Flags;<br>
<br>
uint32_t RecordOffset;<br>
- Hdr Header;<br>
};<br>
<br>
// S_CALLSITEINFO<br>
class CallSiteInfoSym : public SymbolRecord {<br>
-public:<br>
- struct Hdr {<br>
- ulittle32_t CodeOffset;<br>
- ulittle16_t Segment;<br>
- ulittle16_t Reserved;<br>
- TypeIndex Type;<br>
- };<br>
+ static constexpr uint32_t RelocationOffset = 4;<br>
<br>
+public:<br>
explicit CallSiteInfoSym(<wbr>SymbolRecordKind Kind) : SymbolRecord(Kind) {}<br>
- CallSiteInfoSym(uint32_t RecordOffset, const Hdr *H)<br>
- : SymbolRecord(SymbolRecordKind:<wbr>:CallSiteInfoSym),<br>
- RecordOffset(RecordOffset), Header(*H) {}<br>
-<br>
- static Expected<CallSiteInfoSym> deserialize(SymbolRecordKind Kind,<br>
- uint32_t RecordOffset,<br>
- msf::StreamReader &Reader) {<br>
- const Hdr *H = nullptr;<br>
- CV_DESERIALIZE(Reader, H);<br>
-<br>
- return CallSiteInfoSym(RecordOffset, H);<br>
- }<br>
+ explicit CallSiteInfoSym(uint32_t RecordOffset)<br>
+ : SymbolRecord(SymbolRecordKind:<wbr>:CallSiteInfoSym) {}<br>
<br>
uint32_t getRelocationOffset() const {<br>
- return RecordOffset + offsetof(Hdr, CodeOffset);<br>
+ return RecordOffset + RelocationOffset;<br>
}<br>
<br>
+ uint32_t CodeOffset;<br>
+ uint16_t Segment;<br>
+ TypeIndex Type;<br>
+<br>
uint32_t RecordOffset;<br>
- Hdr Header;<br>
};<br>
<br>
// S_HEAPALLOCSITE<br>
class HeapAllocationSiteSym : public SymbolRecord {<br>
-public:<br>
- struct Hdr {<br>
- ulittle32_t CodeOffset;<br>
- ulittle16_t Segment;<br>
- ulittle16_t CallInstructionSize;<br>
- TypeIndex Type;<br>
- };<br>
+ static constexpr uint32_t RelocationOffset = 4;<br>
<br>
+public:<br>
explicit HeapAllocationSiteSym(<wbr>SymbolRecordKind Kind) : SymbolRecord(Kind) {}<br>
- HeapAllocationSiteSym(uint32_t RecordOffset, const Hdr *H)<br>
+ explicit HeapAllocationSiteSym(uint32_t RecordOffset)<br>
: SymbolRecord(SymbolRecordKind:<wbr>:HeapAllocationSiteSym),<br>
- RecordOffset(RecordOffset), Header(*H) {}<br>
-<br>
- static Expected<<wbr>HeapAllocationSiteSym><br>
- deserialize(SymbolRecordKind Kind, uint32_t RecordOffset,<br>
- msf::StreamReader &Reader) {<br>
- const Hdr *H = nullptr;<br>
- CV_DESERIALIZE(Reader, H);<br>
-<br>
- return HeapAllocationSiteSym(<wbr>RecordOffset, H);<br>
- }<br>
+ RecordOffset(RecordOffset) {}<br>
<br>
uint32_t getRelocationOffset() const {<br>
- return RecordOffset + offsetof(Hdr, CodeOffset);<br>
+ return RecordOffset + RelocationOffset;<br>
}<br>
<br>
+ uint32_t CodeOffset;<br>
+ uint16_t Segment;<br>
+ uint16_t CallInstructionSize;<br>
+ TypeIndex Type;<br>
+<br>
uint32_t RecordOffset;<br>
- Hdr Header;<br>
};<br>
<br>
// S_FRAMECOOKIE<br>
class FrameCookieSym : public SymbolRecord {<br>
-public:<br>
- struct Hdr {<br>
- ulittle32_t CodeOffset;<br>
- ulittle16_t Register;<br>
- uint8_t CookieKind;<br>
- uint8_t Flags;<br>
- };<br>
+ static constexpr uint32_t RelocationOffset = 4;<br>
<br>
+public:<br>
explicit FrameCookieSym(<wbr>SymbolRecordKind Kind) : SymbolRecord(Kind) {}<br>
- FrameCookieSym(uint32_t RecordOffset, const Hdr *H)<br>
- : SymbolRecord(SymbolRecordKind:<wbr>:FrameCookieSym),<br>
- RecordOffset(RecordOffset), Header(*H) {}<br>
-<br>
- static Expected<FrameCookieSym> deserialize(SymbolRecordKind Kind,<br>
- uint32_t RecordOffset,<br>
- msf::StreamReader &Reader) {<br>
- const Hdr *H = nullptr;<br>
- CV_DESERIALIZE(Reader, H);<br>
-<br>
- return FrameCookieSym(RecordOffset, H);<br>
- }<br>
+ explicit FrameCookieSym(uint32_t RecordOffset)<br>
+ : SymbolRecord(SymbolRecordKind:<wbr>:FrameCookieSym) {}<br>
<br>
uint32_t getRelocationOffset() const {<br>
- return RecordOffset + offsetof(Hdr, CodeOffset);<br>
+ return RecordOffset + RelocationOffset;<br>
}<br>
<br>
+ uint32_t CodeOffset;<br>
+ uint16_t Register;<br>
+ uint8_t CookieKind;<br>
+ uint8_t Flags;<br>
+<br>
uint32_t RecordOffset;<br>
- Hdr Header;<br>
};<br>
<br>
// S_UDT, S_COBOLUDT<br>
class UDTSym : public SymbolRecord {<br>
public:<br>
- struct Hdr {<br>
- TypeIndex Type; // Type of the UDT<br>
- // Name: The null-terminated name follows.<br>
- };<br>
-<br>
explicit UDTSym(SymbolRecordKind Kind) : SymbolRecord(Kind) {}<br>
- UDTSym(uint32_t RecordOffset, const Hdr *H, StringRef Name)<br>
- : SymbolRecord(SymbolRecordKind:<wbr>:UDTSym), RecordOffset(RecordOffset),<br>
- Header(*H), Name(Name) {}<br>
-<br>
- static Expected<UDTSym> deserialize(SymbolRecordKind Kind,<br>
- uint32_t RecordOffset,<br>
- msf::StreamReader &Reader) {<br>
- const Hdr *H = nullptr;<br>
- StringRef Name;<br>
- CV_DESERIALIZE(Reader, H, Name);<br>
+ explicit UDTSym(uint32_t RecordOffset)<br>
+ : SymbolRecord(SymbolRecordKind:<wbr>:UDTSym) {}<br>
<br>
- return UDTSym(RecordOffset, H, Name);<br>
- }<br>
+ TypeIndex Type;<br>
+ StringRef Name;<br>
<br>
uint32_t RecordOffset;<br>
- Hdr Header;<br>
- StringRef Name;<br>
};<br>
<br>
// S_BUILDINFO<br>
class BuildInfoSym : public SymbolRecord {<br>
public:<br>
- struct Hdr {<br>
- ulittle32_t BuildId;<br>
- };<br>
-<br>
explicit BuildInfoSym(SymbolRecordKind Kind) : SymbolRecord(Kind) {}<br>
- BuildInfoSym(uint32_t RecordOffset, const Hdr *H)<br>
+ BuildInfoSym(uint32_t RecordOffset)<br>
: SymbolRecord(SymbolRecordKind:<wbr>:BuildInfoSym),<br>
- RecordOffset(RecordOffset), Header(*H) {}<br>
+ RecordOffset(RecordOffset) {}<br>
<br>
- static Expected<BuildInfoSym> deserialize(SymbolRecordKind Kind,<br>
- uint32_t RecordOffset,<br>
- msf::StreamReader &Reader) {<br>
- const Hdr *H = nullptr;<br>
- CV_DESERIALIZE(Reader, H);<br>
-<br>
- return BuildInfoSym(RecordOffset, H);<br>
- }<br>
+ uint32_t BuildId;<br>
<br>
uint32_t RecordOffset;<br>
- Hdr Header;<br>
};<br>
<br>
// S_BPREL32<br>
class BPRelativeSym : public SymbolRecord {<br>
public:<br>
- struct Hdr {<br>
- little32_t Offset; // Offset from the base pointer register<br>
- TypeIndex Type; // Type of the variable<br>
- // Name: The null-terminated name follows.<br>
- };<br>
-<br>
explicit BPRelativeSym(SymbolRecordKind Kind) : SymbolRecord(Kind) {}<br>
- BPRelativeSym(uint32_t RecordOffset, const Hdr *H, StringRef Name)<br>
+ explicit BPRelativeSym(uint32_t RecordOffset)<br>
: SymbolRecord(SymbolRecordKind:<wbr>:BPRelativeSym),<br>
- RecordOffset(RecordOffset), Header(*H), Name(Name) {}<br>
-<br>
- static Expected<BPRelativeSym> deserialize(SymbolRecordKind Kind,<br>
- uint32_t RecordOffset,<br>
- msf::StreamReader &Reader) {<br>
- const Hdr *H = nullptr;<br>
- StringRef Name;<br>
- CV_DESERIALIZE(Reader, H, Name);<br>
+ RecordOffset(RecordOffset) {}<br>
<br>
- return BPRelativeSym(RecordOffset, H, Name);<br>
- }<br>
+ int32_t Offset;<br>
+ TypeIndex Type;<br>
+ StringRef Name;<br>
<br>
uint32_t RecordOffset;<br>
- Hdr Header;<br>
- StringRef Name;<br>
};<br>
<br>
// S_REGREL32<br>
class RegRelativeSym : public SymbolRecord {<br>
public:<br>
- struct Hdr {<br>
- ulittle32_t Offset; // Offset from the register<br>
- TypeIndex Type; // Type of the variable<br>
- ulittle16_t Register; // Register to which the variable is relative<br>
- // Name: The null-terminated name follows.<br>
- };<br>
-<br>
explicit RegRelativeSym(<wbr>SymbolRecordKind Kind) : SymbolRecord(Kind) {}<br>
- RegRelativeSym(uint32_t RecordOffset, const Hdr *H, StringRef Name)<br>
+ explicit RegRelativeSym(uint32_t RecordOffset)<br>
: SymbolRecord(SymbolRecordKind:<wbr>:RegRelativeSym),<br>
- RecordOffset(RecordOffset), Header(*H), Name(Name) {}<br>
-<br>
- static Expected<RegRelativeSym> deserialize(SymbolRecordKind Kind,<br>
- uint32_t RecordOffset,<br>
- msf::StreamReader &Reader) {<br>
- const Hdr *H = nullptr;<br>
- StringRef Name;<br>
- CV_DESERIALIZE(Reader, H, Name);<br>
+ RecordOffset(RecordOffset) {}<br>
<br>
- return RegRelativeSym(RecordOffset, H, Name);<br>
- }<br>
+ uint32_t Offset;<br>
+ TypeIndex Type;<br>
+ uint16_t Register;<br>
+ StringRef Name;<br>
<br>
uint32_t RecordOffset;<br>
- Hdr Header;<br>
- StringRef Name;<br>
};<br>
<br>
// S_CONSTANT, S_MANCONSTANT<br>
class ConstantSym : public SymbolRecord {<br>
public:<br>
- struct Hdr {<br>
- TypeIndex Type;<br>
- // Value: The value of the constant.<br>
- // Name: The null-terminated name follows.<br>
- };<br>
-<br>
explicit ConstantSym(SymbolRecordKind Kind) : SymbolRecord(Kind) {}<br>
- ConstantSym(uint32_t RecordOffset, const Hdr *H, const APSInt &Value,<br>
- StringRef Name)<br>
- : SymbolRecord(SymbolRecordKind:<wbr>:ConstantSym), RecordOffset(RecordOffset),<br>
- Header(*H), Value(Value), Name(Name) {}<br>
-<br>
- static Expected<ConstantSym> deserialize(SymbolRecordKind Kind,<br>
- uint32_t RecordOffset,<br>
- msf::StreamReader &Reader) {<br>
- const Hdr *H = nullptr;<br>
- APSInt Value;<br>
- StringRef Name;<br>
- CV_DESERIALIZE(Reader, H, Value, Name);<br>
+ ConstantSym(uint32_t RecordOffset)<br>
+ : SymbolRecord(SymbolRecordKind:<wbr>:ConstantSym),<br>
+ RecordOffset(RecordOffset) {}<br>
<br>
- return ConstantSym(RecordOffset, H, Value, Name);<br>
- }<br>
-<br>
- uint32_t RecordOffset;<br>
- Hdr Header;<br>
+ TypeIndex Type;<br>
APSInt Value;<br>
StringRef Name;<br>
+<br>
+ uint32_t RecordOffset;<br>
};<br>
<br>
// S_LDATA32, S_GDATA32, S_LMANDATA, S_GMANDATA<br>
class DataSym : public SymbolRecord {<br>
-public:<br>
- struct Hdr {<br>
- TypeIndex Type;<br>
- ulittle32_t DataOffset;<br>
- ulittle16_t Segment;<br>
- // Name: The null-terminated name follows.<br>
- };<br>
+ static constexpr uint32_t RelocationOffset = 8;<br>
<br>
+public:<br>
explicit DataSym(SymbolRecordKind Kind) : SymbolRecord(Kind) {}<br>
- DataSym(uint32_t RecordOffset, const Hdr *H, StringRef Name)<br>
- : SymbolRecord(SymbolRecordKind:<wbr>:DataSym), RecordOffset(RecordOffset),<br>
- Header(*H), Name(Name) {}<br>
-<br>
- static Expected<DataSym> deserialize(SymbolRecordKind Kind,<br>
- uint32_t RecordOffset,<br>
- msf::StreamReader &Reader) {<br>
- const Hdr *H = nullptr;<br>
- StringRef Name;<br>
- CV_DESERIALIZE(Reader, H, Name);<br>
-<br>
- return DataSym(RecordOffset, H, Name);<br>
- }<br>
+ DataSym(uint32_t RecordOffset)<br>
+ : SymbolRecord(SymbolRecordKind:<wbr>:DataSym), RecordOffset(RecordOffset) {}<br>
<br>
uint32_t getRelocationOffset() const {<br>
- return RecordOffset + offsetof(Hdr, DataOffset);<br>
+ return RecordOffset + RelocationOffset;<br>
}<br>
<br>
- uint32_t RecordOffset;<br>
- Hdr Header;<br>
+ TypeIndex Type;<br>
+ uint32_t DataOffset;<br>
+ uint16_t Segment;<br>
StringRef Name;<br>
+<br>
+ uint32_t RecordOffset;<br>
};<br>
<br>
// S_LTHREAD32, S_GTHREAD32<br>
class ThreadLocalDataSym : public SymbolRecord {<br>
-public:<br>
- struct Hdr {<br>
- TypeIndex Type;<br>
- ulittle32_t DataOffset;<br>
- ulittle16_t Segment;<br>
- // Name: The null-terminated name follows.<br>
- };<br>
+ static constexpr uint32_t RelocationOffset = 8;<br>
<br>
+public:<br>
explicit ThreadLocalDataSym(<wbr>SymbolRecordKind Kind) : SymbolRecord(Kind) {}<br>
- ThreadLocalDataSym(uint32_t RecordOffset, const Hdr *H, StringRef Name)<br>
+ explicit ThreadLocalDataSym(uint32_t RecordOffset)<br>
: SymbolRecord(SymbolRecordKind:<wbr>:ThreadLocalDataSym),<br>
- RecordOffset(RecordOffset), Header(*H), Name(Name) {}<br>
-<br>
- static Expected<ThreadLocalDataSym> deserialize(SymbolRecordKind Kind,<br>
- uint32_t RecordOffset,<br>
- msf::StreamReader &Reader) {<br>
- const Hdr *H = nullptr;<br>
- StringRef Name;<br>
- CV_DESERIALIZE(Reader, H, Name);<br>
-<br>
- return ThreadLocalDataSym(<wbr>RecordOffset, H, Name);<br>
- }<br>
+ RecordOffset(RecordOffset) {}<br>
<br>
uint32_t getRelocationOffset() const {<br>
- return RecordOffset + offsetof(Hdr, DataOffset);<br>
+ return RecordOffset + RelocationOffset;<br>
}<br>
<br>
- uint32_t RecordOffset;<br>
- Hdr Header;<br>
+ TypeIndex Type;<br>
+ uint32_t DataOffset;<br>
+ uint16_t Segment;<br>
StringRef Name;<br>
+<br>
+ uint32_t RecordOffset;<br>
};<br>
<br>
typedef CVRecord<SymbolKind> CVSymbol;<br>
<br>
Added: llvm/trunk/include/llvm/<wbr>DebugInfo/CodeView/<wbr>SymbolRecordMapping.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/CodeView/SymbolRecordMapping.h?rev=290000&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/include/<wbr>llvm/DebugInfo/CodeView/<wbr>SymbolRecordMapping.h?rev=<wbr>290000&view=auto</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/include/llvm/<wbr>DebugInfo/CodeView/<wbr>SymbolRecordMapping.h (added)<br>
+++ llvm/trunk/include/llvm/<wbr>DebugInfo/CodeView/<wbr>SymbolRecordMapping.h Fri Dec 16 16:48:14 2016<br>
@@ -0,0 +1,44 @@<br>
+//===- SymbolRecordMapping.h ------------------------------<wbr>------*- C++ -*-===//<br>
+//<br>
+// The LLVM Compiler Infrastructure<br>
+//<br>
+// This file is distributed under the University of Illinois Open Source<br>
+// License. See LICENSE.TXT for details.<br>
+//<br>
+//===------------------------<wbr>------------------------------<wbr>----------------===//<br>
+<br>
+#ifndef LLVM_DEBUGINFO_CODEVIEW_<wbr>SYMBOLRECORDMAPPING_H<br>
+#define LLVM_DEBUGINFO_CODEVIEW_<wbr>SYMBOLRECORDMAPPING_H<br>
+<br>
+#include "llvm/DebugInfo/CodeView/<wbr>CodeViewRecordIO.h"<br>
+#include "llvm/DebugInfo/CodeView/<wbr>SymbolVisitorCallbacks.h"<br>
+<br>
+namespace llvm {<br>
+namespace msf {<br>
+class StreamReader;<br>
+class StreamWriter;<br>
+}<br>
+<br>
+namespace codeview {<br>
+class SymbolRecordMapping : public SymbolVisitorCallbacks {<br>
+public:<br>
+ explicit SymbolRecordMapping(msf::<wbr>StreamReader &Reader) : IO(Reader) {}<br>
+ explicit SymbolRecordMapping(msf::<wbr>StreamWriter &Writer) : IO(Writer) {}<br>
+<br>
+ Error visitSymbolBegin(CVSymbol &Record) override;<br>
+ Error visitSymbolEnd(CVSymbol &Record) override;<br>
+<br>
+#define SYMBOL_RECORD(EnumName, EnumVal, Name) \<br>
+ Error visitKnownRecord(CVSymbol &CVR, Name &Record) override;<br>
+#define SYMBOL_RECORD_ALIAS(EnumName, EnumVal, Name, AliasName)<br>
+#include "CVSymbolTypes.def"<br>
+<br>
+private:<br>
+ Optional<SymbolKind> Kind;<br>
+<br>
+ CodeViewRecordIO IO;<br>
+};<br>
+}<br>
+}<br>
+<br>
+#endif<br>
<br>
Added: llvm/trunk/include/llvm/<wbr>DebugInfo/CodeView/<wbr>SymbolSerializer.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/CodeView/SymbolSerializer.h?rev=290000&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/include/<wbr>llvm/DebugInfo/CodeView/<wbr>SymbolSerializer.h?rev=290000&<wbr>view=auto</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/include/llvm/<wbr>DebugInfo/CodeView/<wbr>SymbolSerializer.h (added)<br>
+++ llvm/trunk/include/llvm/<wbr>DebugInfo/CodeView/<wbr>SymbolSerializer.h Fri Dec 16 16:48:14 2016<br>
@@ -0,0 +1,96 @@<br>
+//===- symbolSerializer.h ------------------------------<wbr>---------*- C++ -*-===//<br>
+//<br>
+// The LLVM Compiler Infrastructure<br>
+//<br>
+// This file is distributed under the University of Illinois Open Source<br>
+// License. See LICENSE.TXT for details.<br>
+//<br>
+//===------------------------<wbr>------------------------------<wbr>----------------===//<br>
+<br>
+#ifndef LLVM_DEBUGINFO_CODEVIEW_<wbr>SYMBOLSERIALIZER_H<br>
+#define LLVM_DEBUGINFO_CODEVIEW_<wbr>SYMBOLSERIALIZER_H<br>
+<br>
+#include "llvm/DebugInfo/CodeView/<wbr>SymbolRecordMapping.h"<br>
+#include "llvm/DebugInfo/CodeView/<wbr>SymbolVisitorCallbacks.h"<br>
+#include "llvm/DebugInfo/MSF/<wbr>ByteStream.h"<br>
+#include "llvm/DebugInfo/MSF/<wbr>StreamWriter.h"<br>
+<br>
+#include "llvm/ADT/Optional.h"<br>
+#include "llvm/ADT/SmallVector.h"<br>
+#include "llvm/ADT/StringMap.h"<br>
+#include "llvm/ADT/StringRef.h"<br>
+#include "llvm/ADT/iterator_range.h"<br>
+#include "llvm/Support/Allocator.h"<br>
+#include "llvm/Support/Error.h"<br>
+<br>
+namespace llvm {<br>
+namespace codeview {<br>
+<br>
+class SymbolSerializer : public SymbolVisitorCallbacks {<br>
+ uint32_t RecordStart = 0;<br>
+ msf::StreamWriter &Writer;<br>
+ SymbolRecordMapping Mapping;<br>
+ Optional<SymbolKind> CurrentSymbol;<br>
+<br>
+ Error writeRecordPrefix(SymbolKind Kind) {<br>
+ RecordPrefix Prefix;<br>
+ Prefix.RecordKind = Kind;<br>
+ Prefix.RecordLen = 0;<br>
+ if (auto EC = Writer.writeObject(Prefix))<br>
+ return EC;<br>
+ return Error::success();<br>
+ }<br>
+<br>
+public:<br>
+ explicit SymbolSerializer(msf::<wbr>StreamWriter &Writer)<br>
+ : Writer(Writer), Mapping(Writer) {}<br>
+<br>
+ virtual Error visitSymbolBegin(CVSymbol &Record) override {<br>
+ assert(!CurrentSymbol.<wbr>hasValue() && "Already in a symbol mapping!");<br>
+<br>
+ RecordStart = Writer.getOffset();<br>
+ if (auto EC = writeRecordPrefix(Record.kind(<wbr>)))<br>
+ return EC;<br>
+<br>
+ CurrentSymbol = Record.kind();<br>
+ if (auto EC = Mapping.visitSymbolBegin(<wbr>Record))<br>
+ return EC;<br>
+<br>
+ return Error::success();<br>
+ }<br>
+<br>
+ virtual Error visitSymbolEnd(CVSymbol &Record) override {<br>
+ assert(CurrentSymbol.hasValue(<wbr>) && "Not in a symbol mapping!");<br>
+<br>
+ if (auto EC = Mapping.visitSymbolEnd(Record)<wbr>)<br>
+ return EC;<br>
+<br>
+ uint32_t RecordEnd = Writer.getOffset();<br>
+ Writer.setOffset(RecordStart);<br>
+ uint16_t Length = RecordEnd - Writer.getOffset() - 2;<br>
+ if (auto EC = Writer.writeInteger(Length))<br>
+ return EC;<br>
+<br>
+ Writer.setOffset(RecordEnd);<br>
+ CurrentSymbol.reset();<br>
+<br>
+ return Error::success();<br>
+ }<br>
+<br>
+#define SYMBOL_RECORD(EnumName, EnumVal, Name) \<br>
+ virtual Error visitKnownRecord(CVSymbol &CVR, Name &Record) override { \<br>
+ return visitKnownRecordImpl(CVR, Record); \<br>
+ }<br>
+#define SYMBOL_RECORD_ALIAS(EnumName, EnumVal, Name, AliasName)<br>
+#include "CVSymbolTypes.def"<br>
+<br>
+private:<br>
+ template <typename RecordKind><br>
+ Error visitKnownRecordImpl(CVSymbol &CVR, RecordKind &Record) {<br>
+ return Mapping.visitKnownRecord(CVR, Record);<br>
+ }<br>
+};<br>
+}<br>
+}<br>
+<br>
+#endif<br>
<br>
Modified: llvm/trunk/lib/CodeGen/<wbr>AsmPrinter/CodeViewDebug.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/CodeViewDebug.cpp?rev=290000&r1=289999&r2=290000&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/lib/<wbr>CodeGen/AsmPrinter/<wbr>CodeViewDebug.cpp?rev=290000&<wbr>r1=289999&r2=290000&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/lib/CodeGen/<wbr>AsmPrinter/CodeViewDebug.cpp (original)<br>
+++ llvm/trunk/lib/CodeGen/<wbr>AsmPrinter/CodeViewDebug.cpp Fri Dec 16 16:48:14 2016<br>
@@ -2072,35 +2072,39 @@ void CodeViewDebug::<wbr>emitLocalVariable(co<br>
(DefRange.StructOffset<br>
<< DefRangeRegisterRelSym::<wbr>OffsetInParentShift);<br>
}<br>
- DefRangeRegisterRelSym Sym(DefRange.CVRegister, RegRelFlags,<br>
- DefRange.DataOffset, None);<br>
+ DefRangeRegisterRelSym Sym(S_DEFRANGE_REGISTER_REL);<br>
+ Sym.Hdr.Register = DefRange.CVRegister;<br>
+ Sym.Hdr.Flags = RegRelFlags;<br>
+ Sym.Hdr.BasePointerOffset = DefRange.DataOffset;<br>
ulittle16_t SymKind = ulittle16_t(S_DEFRANGE_<wbr>REGISTER_REL);<br>
BytePrefix +=<br>
StringRef(reinterpret_cast<<wbr>const char *>(&SymKind), sizeof(SymKind));<br>
BytePrefix +=<br>
- StringRef(reinterpret_cast<<wbr>const char *>(&Sym.Header),<br>
- sizeof(Sym.Header) - sizeof(LocalVariableAddrRange)<wbr>);<br>
+ StringRef(reinterpret_cast<<wbr>const char *>(&Sym.Hdr), sizeof(Sym.Hdr));<br>
} else {<br>
assert(DefRange.DataOffset == 0 && "unexpected offset into register");<br>
if (DefRange.IsSubfield) {<br>
// Unclear what matters here.<br>
- DefRangeSubfieldRegisterSym Sym(DefRange.CVRegister, 0,<br>
- DefRange.StructOffset, None);<br>
+ DefRangeSubfieldRegisterSym Sym(S_DEFRANGE_SUBFIELD_<wbr>REGISTER);<br>
+ Sym.Hdr.Register = DefRange.CVRegister;<br>
+ Sym.Hdr.MayHaveNoName = 0;<br>
+ Sym.Hdr.OffsetInParent = DefRange.StructOffset;<br>
+<br>
ulittle16_t SymKind = ulittle16_t(S_DEFRANGE_<wbr>SUBFIELD_REGISTER);<br>
BytePrefix += StringRef(reinterpret_cast<<wbr>const char *>(&SymKind),<br>
sizeof(SymKind));<br>
- BytePrefix +=<br>
- StringRef(reinterpret_cast<<wbr>const char *>(&Sym.Header),<br>
- sizeof(Sym.Header) - sizeof(LocalVariableAddrRange)<wbr>);<br>
+ BytePrefix += StringRef(reinterpret_cast<<wbr>const char *>(&Sym.Hdr),<br>
+ sizeof(Sym.Hdr));<br>
} else {<br>
// Unclear what matters here.<br>
- DefRangeRegisterSym Sym(DefRange.CVRegister, 0, None);<br>
+ DefRangeRegisterSym Sym(S_DEFRANGE_REGISTER);<br>
+ Sym.Hdr.Register = DefRange.CVRegister;<br>
+ Sym.Hdr.MayHaveNoName = 0;<br>
ulittle16_t SymKind = ulittle16_t(S_DEFRANGE_<wbr>REGISTER);<br>
BytePrefix += StringRef(reinterpret_cast<<wbr>const char *>(&SymKind),<br>
sizeof(SymKind));<br>
- BytePrefix +=<br>
- StringRef(reinterpret_cast<<wbr>const char *>(&Sym.Header),<br>
- sizeof(Sym.Header) - sizeof(LocalVariableAddrRange)<wbr>);<br>
+ BytePrefix += StringRef(reinterpret_cast<<wbr>const char *>(&Sym.Hdr),<br>
+ sizeof(Sym.Hdr));<br>
}<br>
}<br>
OS.EmitCVDefRangeDirective(<wbr>DefRange.Ranges, BytePrefix);<br>
<br>
Modified: llvm/trunk/lib/DebugInfo/<wbr>CodeView/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/CodeView/CMakeLists.txt?rev=290000&r1=289999&r2=290000&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/lib/<wbr>DebugInfo/CodeView/CMakeLists.<wbr>txt?rev=290000&r1=289999&r2=<wbr>290000&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/lib/DebugInfo/<wbr>CodeView/CMakeLists.txt (original)<br>
+++ llvm/trunk/lib/DebugInfo/<wbr>CodeView/CMakeLists.txt Fri Dec 16 16:48:14 2016<br>
@@ -8,7 +8,9 @@ add_llvm_library(<wbr>LLVMDebugInfoCodeView<br>
ModuleSubstream.cpp<br>
ModuleSubstreamVisitor.cpp<br>
RecordSerialization.cpp<br>
+ SymbolRecordMapping.cpp<br>
SymbolDumper.cpp<br>
+ SymbolSerializer.cpp<br>
TypeDumper.cpp<br>
TypeRecord.cpp<br>
TypeRecordMapping.cpp<br>
<br>
Modified: llvm/trunk/lib/DebugInfo/<wbr>CodeView/CodeViewRecordIO.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/CodeView/CodeViewRecordIO.cpp?rev=290000&r1=289999&r2=290000&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/lib/<wbr>DebugInfo/CodeView/<wbr>CodeViewRecordIO.cpp?rev=<wbr>290000&r1=289999&r2=290000&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/lib/DebugInfo/<wbr>CodeView/CodeViewRecordIO.cpp (original)<br>
+++ llvm/trunk/lib/DebugInfo/<wbr>CodeView/CodeViewRecordIO.cpp Fri Dec 16 16:48:14 2016<br>
@@ -75,6 +75,16 @@ Error CodeViewRecordIO::<wbr>mapByteVectorTai<br>
return Error::success();<br>
}<br>
<br>
+Error CodeViewRecordIO::<wbr>mapByteVectorTail(std::vector<<wbr>uint8_t> &Bytes) {<br>
+ ArrayRef<uint8_t> BytesRef(Bytes);<br>
+ if (auto EC = mapByteVectorTail(BytesRef))<br>
+ return EC;<br>
+ if (!isWriting())<br>
+ Bytes.assign(BytesRef.begin(), BytesRef.end());<br>
+<br>
+ return Error::success();<br>
+}<br>
+<br>
Error CodeViewRecordIO::mapInteger(<wbr>TypeIndex &TypeInd) {<br>
if (isWriting()) {<br>
if (auto EC = Writer->writeInteger(TypeInd.<wbr>getIndex()))<br>
@@ -159,6 +169,27 @@ Error CodeViewRecordIO::mapGuid(<wbr>StringRe<br>
}<br>
return Error::success();<br>
}<br>
+<br>
+Error CodeViewRecordIO::<wbr>mapStringZVectorZ(std::vector<<wbr>StringRef> &Value) {<br>
+ if (isWriting()) {<br>
+ for (auto V : Value) {<br>
+ if (auto EC = mapStringZ(V))<br>
+ return EC;<br>
+ }<br>
+ if (auto EC = Writer->writeInteger(uint8_t(<wbr>0)))<br>
+ return EC;<br>
+ } else {<br>
+ StringRef S;<br>
+ if (auto EC = mapStringZ(S))<br>
+ return EC;<br>
+ while (!S.empty()) {<br>
+ Value.push_back(S);<br>
+ if (auto EC = mapStringZ(S))<br>
+ return EC;<br>
+ };<br>
+ }<br>
+ return Error::success();<br>
+}<br>
<br>
Error CodeViewRecordIO::<wbr>writeEncodedSignedInteger(<wbr>const int64_t &Value) {<br>
assert(Value < 0 && "Encoded integer is not signed!");<br>
<br>
Modified: llvm/trunk/lib/DebugInfo/<wbr>CodeView/SymbolDumper.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/CodeView/SymbolDumper.cpp?rev=290000&r1=289999&r2=290000&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/lib/<wbr>DebugInfo/CodeView/<wbr>SymbolDumper.cpp?rev=290000&<wbr>r1=289999&r2=290000&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/lib/DebugInfo/<wbr>CodeView/SymbolDumper.cpp (original)<br>
+++ llvm/trunk/lib/DebugInfo/<wbr>CodeView/SymbolDumper.cpp Fri Dec 16 16:48:14 2016<br>
@@ -94,14 +94,14 @@ Error CVSymbolDumperImpl::<wbr>visitKnownReco<br>
DictScope S(W, "BlockStart");<br>
<br>
StringRef LinkageName;<br>
- W.printHex("PtrParent", Block.Header.PtrParent);<br>
- W.printHex("PtrEnd", Block.Header.PtrEnd);<br>
- W.printHex("CodeSize", Block.Header.CodeSize);<br>
+ W.printHex("PtrParent", Block.Parent);<br>
+ W.printHex("PtrEnd", Block.End);<br>
+ W.printHex("CodeSize", Block.CodeSize);<br>
if (ObjDelegate) {<br>
ObjDelegate-><wbr>printRelocatedField("<wbr>CodeOffset", Block.getRelocationOffset(),<br>
- Block.Header.CodeOffset, &LinkageName);<br>
+ Block.CodeOffset, &LinkageName);<br>
}<br>
- W.printHex("Segment", Block.Header.Segment);<br>
+ W.printHex("Segment", Block.Segment);<br>
W.printString("BlockName", Block.Name);<br>
W.printString("LinkageName", LinkageName);<br>
return Error::success();<br>
@@ -109,36 +109,35 @@ Error CVSymbolDumperImpl::<wbr>visitKnownReco<br>
<br>
Error CVSymbolDumperImpl::<wbr>visitKnownRecord(CVSymbol &CVR, Thunk32Sym &Thunk) {<br>
DictScope S(W, "Thunk32");<br>
- W.printNumber("Parent", Thunk.Header.Parent);<br>
- W.printNumber("End", Thunk.Header.End);<br>
- W.printNumber("Next", Thunk.Header.Next);<br>
- W.printNumber("Off", Thunk.Header.Off);<br>
- W.printNumber("Seg", Thunk.Header.Seg);<br>
- W.printNumber("Len", Thunk.Header.Len);<br>
- W.printEnum("Ordinal", Thunk.Header.Ord, getThunkOrdinalNames());<br>
+ W.printNumber("Parent", Thunk.Parent);<br>
+ W.printNumber("End", Thunk.End);<br>
+ W.printNumber("Next", Thunk.Next);<br>
+ W.printNumber("Off", Thunk.Offset);<br>
+ W.printNumber("Seg", Thunk.Segment);<br>
+ W.printNumber("Len", Thunk.Length);<br>
+ W.printEnum("Ordinal", uint8_t(Thunk.Thunk), getThunkOrdinalNames());<br>
return Error::success();<br>
}<br>
<br>
Error CVSymbolDumperImpl::<wbr>visitKnownRecord(CVSymbol &CVR,<br>
TrampolineSym &Tramp) {<br>
DictScope S(W, "Trampoline");<br>
- W.printEnum("Type", Tramp.Header.Type, getTrampolineNames());<br>
- W.printNumber("Size", Tramp.Header.Size);<br>
- W.printNumber("ThunkOff", Tramp.Header.ThunkOff);<br>
- W.printNumber("TargetOff", Tramp.Header.TargetOff);<br>
- W.printNumber("ThunkSection", Tramp.Header.ThunkSection);<br>
- W.printNumber("TargetSection", Tramp.Header.TargetSection);<br>
+ W.printEnum("Type", uint16_t(Tramp.Type), getTrampolineNames());<br>
+ W.printNumber("Size", Tramp.Size);<br>
+ W.printNumber("ThunkOff", Tramp.ThunkOffset);<br>
+ W.printNumber("TargetOff", Tramp.TargetOffset);<br>
+ W.printNumber("ThunkSection", Tramp.ThunkSection);<br>
+ W.printNumber("TargetSection", Tramp.TargetSection);<br>
return Error::success();<br>
}<br>
<br>
Error CVSymbolDumperImpl::<wbr>visitKnownRecord(CVSymbol &CVR, SectionSym &Section) {<br>
DictScope S(W, "Section");<br>
- W.printNumber("SectionNumber", Section.Header.SectionNumber);<br>
- W.printNumber("Alignment", Section.Header.Alignment);<br>
- W.printNumber("Reserved", Section.Header.Reserved);<br>
- W.printNumber("Rva", Section.Header.Rva);<br>
- W.printNumber("Length", Section.Header.Length);<br>
- W.printFlags("Characteristics"<wbr>, Section.Header.<wbr>Characteristics,<br>
+ W.printNumber("SectionNumber", Section.SectionNumber);<br>
+ W.printNumber("Alignment", Section.Alignment);<br>
+ W.printNumber("Rva", Section.Rva);<br>
+ W.printNumber("Length", Section.Length);<br>
+ W.printFlags("Characteristics"<wbr>, Section.Characteristics,<br>
getImageSectionCharacteristicN<wbr>ames(),<br>
COFF::SectionCharacteristics(<wbr>0x00F00000));<br>
<br>
@@ -149,12 +148,12 @@ Error CVSymbolDumperImpl::<wbr>visitKnownReco<br>
Error CVSymbolDumperImpl::<wbr>visitKnownRecord(CVSymbol &CVR,<br>
CoffGroupSym &CoffGroup) {<br>
DictScope S(W, "COFF Group");<br>
- W.printNumber("Size", CoffGroup.Header.Size);<br>
- W.printFlags("Characteristics"<wbr>, CoffGroup.Header.<wbr>Characteristics,<br>
+ W.printNumber("Size", CoffGroup.Size);<br>
+ W.printFlags("Characteristics"<wbr>, CoffGroup.Characteristics,<br>
getImageSectionCharacteristicN<wbr>ames(),<br>
COFF::SectionCharacteristics(<wbr>0x00F00000));<br>
- W.printNumber("Offset", CoffGroup.Header.Offset);<br>
- W.printNumber("Segment", CoffGroup.Header.Segment);<br>
+ W.printNumber("Offset", CoffGroup.Offset);<br>
+ W.printNumber("Segment", CoffGroup.Segment);<br>
W.printString("Name", CoffGroup.Name);<br>
return Error::success();<br>
}<br>
@@ -163,8 +162,8 @@ Error CVSymbolDumperImpl::<wbr>visitKnownReco<br>
BPRelativeSym &BPRel) {<br>
DictScope S(W, "BPRelativeSym");<br>
<br>
- W.printNumber("Offset", BPRel.Header.Offset);<br>
- CVTD.printTypeIndex("Type", BPRel.Header.Type);<br>
+ W.printNumber("Offset", BPRel.Offset);<br>
+ CVTD.printTypeIndex("Type", BPRel.Type);<br>
W.printString("VarName", BPRel.Name);<br>
return Error::success();<br>
}<br>
@@ -173,7 +172,7 @@ Error CVSymbolDumperImpl::<wbr>visitKnownReco<br>
BuildInfoSym &BuildInfo) {<br>
DictScope S(W, "BuildInfo");<br>
<br>
- W.printNumber("BuildId", BuildInfo.Header.BuildId);<br>
+ W.printNumber("BuildId", BuildInfo.BuildId);<br>
return Error::success();<br>
}<br>
<br>
@@ -183,13 +182,12 @@ Error CVSymbolDumperImpl::<wbr>visitKnownReco<br>
<br>
StringRef LinkageName;<br>
if (ObjDelegate) {<br>
- ObjDelegate-><wbr>printRelocatedField(<br>
- "CodeOffset", CallSiteInfo.<wbr>getRelocationOffset(),<br>
- CallSiteInfo.Header.<wbr>CodeOffset, &LinkageName);<br>
- }<br>
- W.printHex("Segment", CallSiteInfo.Header.Segment);<br>
- W.printHex("Reserved", CallSiteInfo.Header.Reserved);<br>
- CVTD.printTypeIndex("Type", CallSiteInfo.Header.Type);<br>
+ ObjDelegate-><wbr>printRelocatedField("<wbr>CodeOffset",<br>
+ CallSiteInfo.<wbr>getRelocationOffset(),<br>
+ CallSiteInfo.CodeOffset, &LinkageName);<br>
+ }<br>
+ W.printHex("Segment", CallSiteInfo.Segment);<br>
+ CVTD.printTypeIndex("Type", CallSiteInfo.Type);<br>
if (!LinkageName.empty())<br>
W.printString("LinkageName", LinkageName);<br>
return Error::success();<br>
@@ -199,7 +197,6 @@ Error CVSymbolDumperImpl::<wbr>visitKnownReco<br>
EnvBlockSym &EnvBlock) {<br>
DictScope S(W, "EnvBlock");<br>
<br>
- W.printNumber("Reserved", EnvBlock.Header.Reserved);<br>
ListScope L(W, "Entries");<br>
for (auto Entry : EnvBlock.Fields) {<br>
W.printString(Entry);<br>
@@ -210,17 +207,17 @@ Error CVSymbolDumperImpl::<wbr>visitKnownReco<br>
Error CVSymbolDumperImpl::<wbr>visitKnownRecord(CVSymbol &CVR,<br>
FileStaticSym &FileStatic) {<br>
DictScope S(W, "FileStatic");<br>
- W.printNumber("Index", FileStatic.Header.Index);<br>
- W.printNumber("<wbr>ModFilenameOffset", FileStatic.Header.<wbr>ModFilenameOffset);<br>
- W.printFlags("Flags", uint16_t(FileStatic.Header.<wbr>Flags), getLocalFlagNames());<br>
+ W.printNumber("Index", FileStatic.Index);<br>
+ W.printNumber("<wbr>ModFilenameOffset", FileStatic.ModFilenameOffset);<br>
+ W.printFlags("Flags", uint16_t(FileStatic.Flags), getLocalFlagNames());<br>
W.printString("Name", FileStatic.Name);<br>
return Error::success();<br>
}<br>
<br>
Error CVSymbolDumperImpl::<wbr>visitKnownRecord(CVSymbol &CVR, ExportSym &Export) {<br>
DictScope S(W, "Export");<br>
- W.printNumber("Ordinal", Export.Header.Ordinal);<br>
- W.printFlags("Flags", Export.Header.Flags, getExportSymFlagNames());<br>
+ W.printNumber("Ordinal", Export.Ordinal);<br>
+ W.printFlags("Flags", uint16_t(Export.Flags), getExportSymFlagNames());<br>
W.printString("Name", Export.Name);<br>
return Error::success();<br>
}<br>
@@ -229,24 +226,20 @@ Error CVSymbolDumperImpl::<wbr>visitKnownReco<br>
Compile2Sym &Compile2) {<br>
DictScope S(W, "CompilerFlags2");<br>
<br>
- W.printEnum("Language", Compile2.Header.getLanguage(),<br>
- getSourceLanguageNames());<br>
- W.printFlags("Flags", Compile2.Header.flags & ~0xff,<br>
- getCompileSym2FlagNames());<br>
- W.printEnum("Machine", unsigned(Compile2.Header.<wbr>Machine), getCPUTypeNames());<br>
+ W.printEnum("Language", Compile2.getLanguage(), getSourceLanguageNames());<br>
+ W.printFlags("Flags", Compile2.getFlags(), getCompileSym2FlagNames());<br>
+ W.printEnum("Machine", unsigned(Compile2.Machine), getCPUTypeNames());<br>
std::string FrontendVersion;<br>
{<br>
raw_string_ostream Out(FrontendVersion);<br>
- Out << Compile2.Header.<wbr>VersionFrontendMajor << '.'<br>
- << Compile2.Header.<wbr>VersionFrontendMinor << '.'<br>
- << Compile2.Header.<wbr>VersionFrontendBuild;<br>
+ Out << Compile2.VersionFrontendMajor << '.' << Compile2.VersionFrontendMinor<br>
+ << '.' << Compile2.VersionFrontendBuild;<br>
}<br>
std::string BackendVersion;<br>
{<br>
raw_string_ostream Out(BackendVersion);<br>
- Out << Compile2.Header.<wbr>VersionBackendMajor << '.'<br>
- << Compile2.Header.<wbr>VersionBackendMinor << '.'<br>
- << Compile2.Header.<wbr>VersionBackendBuild;<br>
+ Out << Compile2.VersionBackendMajor << '.' << Compile2.VersionBackendMinor<br>
+ << '.' << Compile2.VersionBackendBuild;<br>
}<br>
W.printString("<wbr>FrontendVersion", FrontendVersion);<br>
W.printString("BackendVersion"<wbr>, BackendVersion);<br>
@@ -258,26 +251,22 @@ Error CVSymbolDumperImpl::<wbr>visitKnownReco<br>
Compile3Sym &Compile3) {<br>
DictScope S(W, "CompilerFlags3");<br>
<br>
- W.printEnum("Language", Compile3.Header.getLanguage(),<br>
- getSourceLanguageNames());<br>
- W.printFlags("Flags", Compile3.Header.flags & ~0xff,<br>
- getCompileSym3FlagNames());<br>
- W.printEnum("Machine", unsigned(Compile3.Header.<wbr>Machine), getCPUTypeNames());<br>
+ W.printEnum("Language", Compile3.getLanguage(), getSourceLanguageNames());<br>
+ W.printFlags("Flags", Compile3.getFlags(), getCompileSym3FlagNames());<br>
+ W.printEnum("Machine", unsigned(Compile3.Machine), getCPUTypeNames());<br>
std::string FrontendVersion;<br>
{<br>
raw_string_ostream Out(FrontendVersion);<br>
- Out << Compile3.Header.<wbr>VersionFrontendMajor << '.'<br>
- << Compile3.Header.<wbr>VersionFrontendMinor << '.'<br>
- << Compile3.Header.<wbr>VersionFrontendBuild << '.'<br>
- << Compile3.Header.<wbr>VersionFrontendQFE;<br>
+ Out << Compile3.VersionFrontendMajor << '.' << Compile3.VersionFrontendMinor<br>
+ << '.' << Compile3.VersionFrontendBuild << '.'<br>
+ << Compile3.VersionFrontendQFE;<br>
}<br>
std::string BackendVersion;<br>
{<br>
raw_string_ostream Out(BackendVersion);<br>
- Out << Compile3.Header.<wbr>VersionBackendMajor << '.'<br>
- << Compile3.Header.<wbr>VersionBackendMinor << '.'<br>
- << Compile3.Header.<wbr>VersionBackendBuild << '.'<br>
- << Compile3.Header.<wbr>VersionBackendQFE;<br>
+ Out << Compile3.VersionBackendMajor << '.' << Compile3.VersionBackendMinor<br>
+ << '.' << Compile3.VersionBackendBuild << '.'<br>
+ << Compile3.VersionBackendQFE;<br>
}<br>
W.printString("<wbr>FrontendVersion", FrontendVersion);<br>
W.printString("BackendVersion"<wbr>, BackendVersion);<br>
@@ -289,7 +278,7 @@ Error CVSymbolDumperImpl::<wbr>visitKnownReco<br>
ConstantSym &Constant) {<br>
DictScope S(W, "Constant");<br>
<br>
- CVTD.printTypeIndex("Type", Constant.Header.Type);<br>
+ CVTD.printTypeIndex("Type", Constant.Type);<br>
W.printNumber("Value", Constant.Value);<br>
W.printString("Name", Constant.Name);<br>
return Error::success();<br>
@@ -302,9 +291,9 @@ Error CVSymbolDumperImpl::<wbr>visitKnownReco<br>
StringRef LinkageName;<br>
if (ObjDelegate) {<br>
ObjDelegate-><wbr>printRelocatedField("<wbr>DataOffset", Data.getRelocationOffset(),<br>
- Data.Header.DataOffset, &LinkageName);<br>
+ Data.DataOffset, &LinkageName);<br>
}<br>
- CVTD.printTypeIndex("Type", Data.Header.Type);<br>
+ CVTD.printTypeIndex("Type", Data.Type);<br>
W.printString("DisplayName", Data.Name);<br>
if (!LinkageName.empty())<br>
W.printString("LinkageName", LinkageName);<br>
@@ -315,7 +304,7 @@ Error CVSymbolDumperImpl::<wbr>visitKnownReco<br>
CVSymbol &CVR,<br>
DefRangeFramePointerRelFullSco<wbr>peSym &<wbr>DefRangeFramePointerRelFullSco<wbr>pe) {<br>
DictScope S(W, "<wbr>DefRangeFramePointerRelFullSco<wbr>pe");<br>
- W.printNumber("Offset", DefRangeFramePointerRelFullSco<wbr>pe.Header.Offset);<br>
+ W.printNumber("Offset", DefRangeFramePointerRelFullSco<wbr>pe.Offset);<br>
return Error::success();<br>
}<br>
<br>
@@ -323,8 +312,8 @@ Error CVSymbolDumperImpl::<wbr>visitKnownReco<br>
CVSymbol &CVR, DefRangeFramePointerRelSym &DefRangeFramePointerRel) {<br>
DictScope S(W, "DefRangeFramePointerRel");<br>
<br>
- W.printNumber("Offset", DefRangeFramePointerRel.<wbr>Header.Offset);<br>
- printLocalVariableAddrRange(<wbr>DefRangeFramePointerRel.<wbr>Header.Range,<br>
+ W.printNumber("Offset", DefRangeFramePointerRel.<wbr>Offset);<br>
+ printLocalVariableAddrRange(<wbr>DefRangeFramePointerRel.Range,<br>
DefRangeFramePointerRel.<wbr>getRelocationOffset());<br>
printLocalVariableAddrGap(<wbr>DefRangeFramePointerRel.Gaps);<br>
return Error::success();<br>
@@ -334,13 +323,12 @@ Error CVSymbolDumperImpl::<wbr>visitKnownReco<br>
CVSymbol &CVR, DefRangeRegisterRelSym &DefRangeRegisterRel) {<br>
DictScope S(W, "DefRangeRegisterRel");<br>
<br>
- W.printNumber("BaseRegister", DefRangeRegisterRel.Header.<wbr>BaseRegister);<br>
+ W.printNumber("BaseRegister", DefRangeRegisterRel.Hdr.<wbr>Register);<br>
W.printBoolean("<wbr>HasSpilledUDTMember",<br>
DefRangeRegisterRel.<wbr>hasSpilledUDTMember());<br>
W.printNumber("OffsetInParent"<wbr>, DefRangeRegisterRel.<wbr>offsetInParent());<br>
- W.printNumber("<wbr>BasePointerOffset",<br>
- DefRangeRegisterRel.Header.<wbr>BasePointerOffset);<br>
- printLocalVariableAddrRange(<wbr>DefRangeRegisterRel.Header.<wbr>Range,<br>
+ W.printNumber("<wbr>BasePointerOffset", DefRangeRegisterRel.Hdr.<wbr>BasePointerOffset);<br>
+ printLocalVariableAddrRange(<wbr>DefRangeRegisterRel.Range,<br>
DefRangeRegisterRel.<wbr>getRelocationOffset());<br>
printLocalVariableAddrGap(<wbr>DefRangeRegisterRel.Gaps);<br>
return Error::success();<br>
@@ -350,9 +338,9 @@ Error CVSymbolDumperImpl::<wbr>visitKnownReco<br>
CVSymbol &CVR, DefRangeRegisterSym &DefRangeRegister) {<br>
DictScope S(W, "DefRangeRegister");<br>
<br>
- W.printNumber("Register", DefRangeRegister.Header.<wbr>Register);<br>
- W.printNumber("MayHaveNoName", DefRangeRegister.Header.<wbr>MayHaveNoName);<br>
- printLocalVariableAddrRange(<wbr>DefRangeRegister.Header.Range,<br>
+ W.printNumber("Register", DefRangeRegister.Hdr.Register)<wbr>;<br>
+ W.printNumber("MayHaveNoName", DefRangeRegister.Hdr.<wbr>MayHaveNoName);<br>
+ printLocalVariableAddrRange(<wbr>DefRangeRegister.Range,<br>
DefRangeRegister.<wbr>getRelocationOffset());<br>
printLocalVariableAddrGap(<wbr>DefRangeRegister.Gaps);<br>
return Error::success();<br>
@@ -362,11 +350,10 @@ Error CVSymbolDumperImpl::<wbr>visitKnownReco<br>
CVSymbol &CVR, DefRangeSubfieldRegisterSym &DefRangeSubfieldRegister) {<br>
DictScope S(W, "DefRangeSubfieldRegister");<br>
<br>
- W.printNumber("Register", DefRangeSubfieldRegister.<wbr>Header.Register);<br>
- W.printNumber("MayHaveNoName", DefRangeSubfieldRegister.<wbr>Header.MayHaveNoName);<br>
- W.printNumber("OffsetInParent"<wbr>,<br>
- DefRangeSubfieldRegister.<wbr>Header.OffsetInParent);<br>
- printLocalVariableAddrRange(<wbr>DefRangeSubfieldRegister.<wbr>Header.Range,<br>
+ W.printNumber("Register", DefRangeSubfieldRegister.Hdr.<wbr>Register);<br>
+ W.printNumber("MayHaveNoName", DefRangeSubfieldRegister.Hdr.<wbr>MayHaveNoName);<br>
+ W.printNumber("OffsetInParent"<wbr>, DefRangeSubfieldRegister.Hdr.<wbr>OffsetInParent);<br>
+ printLocalVariableAddrRange(<wbr>DefRangeSubfieldRegister.<wbr>Range,<br>
DefRangeSubfieldRegister.<wbr>getRelocationOffset());<br>
printLocalVariableAddrGap(<wbr>DefRangeSubfieldRegister.Gaps)<wbr>;<br>
return Error::success();<br>
@@ -378,7 +365,7 @@ Error CVSymbolDumperImpl::<wbr>visitKnownReco<br>
<br>
if (ObjDelegate) {<br>
StringRef StringTable = ObjDelegate->getStringTable();<br>
- auto ProgramStringTableOffset = DefRangeSubfield.Header.<wbr>Program;<br>
+ auto ProgramStringTableOffset = DefRangeSubfield.Program;<br>
if (ProgramStringTableOffset >= StringTable.size())<br>
return llvm::make_error<<wbr>CodeViewError>(<br>
"String table offset outside of bounds of String Table!");<br>
@@ -386,8 +373,8 @@ Error CVSymbolDumperImpl::<wbr>visitKnownReco<br>
StringTable.drop_front(<wbr>ProgramStringTableOffset).<wbr>split('\0').first;<br>
W.printString("Program", Program);<br>
}<br>
- W.printNumber("OffsetInParent"<wbr>, DefRangeSubfield.Header.<wbr>OffsetInParent);<br>
- printLocalVariableAddrRange(<wbr>DefRangeSubfield.Header.Range,<br>
+ W.printNumber("OffsetInParent"<wbr>, DefRangeSubfield.<wbr>OffsetInParent);<br>
+ printLocalVariableAddrRange(<wbr>DefRangeSubfield.Range,<br>
DefRangeSubfield.<wbr>getRelocationOffset());<br>
printLocalVariableAddrGap(<wbr>DefRangeSubfield.Gaps);<br>
return Error::success();<br>
@@ -399,7 +386,7 @@ Error CVSymbolDumperImpl::<wbr>visitKnownReco<br>
<br>
if (ObjDelegate) {<br>
StringRef StringTable = ObjDelegate->getStringTable();<br>
- auto ProgramStringTableOffset = DefRange.Header.Program;<br>
+ auto ProgramStringTableOffset = DefRange.Program;<br>
if (ProgramStringTableOffset >= StringTable.size())<br>
return llvm::make_error<<wbr>CodeViewError>(<br>
"String table offset outside of bounds of String Table!");<br>
@@ -407,8 +394,7 @@ Error CVSymbolDumperImpl::<wbr>visitKnownReco<br>
StringTable.drop_front(<wbr>ProgramStringTableOffset).<wbr>split('\0').first;<br>
W.printString("Program", Program);<br>
}<br>
- printLocalVariableAddrRange(<wbr>DefRange.Header.Range,<br>
- DefRange.getRelocationOffset()<wbr>);<br>
+ printLocalVariableAddrRange(<wbr>DefRange.Range, DefRange.getRelocationOffset()<wbr>);<br>
printLocalVariableAddrGap(<wbr>DefRange.Gaps);<br>
return Error::success();<br>
}<br>
@@ -419,14 +405,14 @@ Error CVSymbolDumperImpl::<wbr>visitKnownReco<br>
<br>
StringRef LinkageName;<br>
if (ObjDelegate) {<br>
- ObjDelegate-><wbr>printRelocatedField(<br>
- "CodeOffset", FrameCookie.<wbr>getRelocationOffset(),<br>
- FrameCookie.Header.CodeOffset, &LinkageName);<br>
+ ObjDelegate-><wbr>printRelocatedField("<wbr>CodeOffset",<br>
+ FrameCookie.<wbr>getRelocationOffset(),<br>
+ FrameCookie.CodeOffset, &LinkageName);<br>
}<br>
- W.printHex("Register", FrameCookie.Header.Register);<br>
- W.printEnum("CookieKind", uint16_t(FrameCookie.Header.<wbr>CookieKind),<br>
+ W.printHex("Register", FrameCookie.Register);<br>
+ W.printEnum("CookieKind", uint16_t(FrameCookie.<wbr>CookieKind),<br>
getFrameCookieKindNames());<br>
- W.printHex("Flags", FrameCookie.Header.Flags);<br>
+ W.printHex("Flags", FrameCookie.Flags);<br>
return Error::success();<br>
}<br>
<br>
@@ -434,16 +420,16 @@ Error CVSymbolDumperImpl::<wbr>visitKnownReco<br>
FrameProcSym &FrameProc) {<br>
DictScope S(W, "FrameProc");<br>
<br>
- W.printHex("TotalFrameBytes", FrameProc.Header.<wbr>TotalFrameBytes);<br>
- W.printHex("PaddingFrameBytes"<wbr>, FrameProc.Header.<wbr>PaddingFrameBytes);<br>
- W.printHex("OffsetToPadding", FrameProc.Header.<wbr>OffsetToPadding);<br>
+ W.printHex("TotalFrameBytes", FrameProc.TotalFrameBytes);<br>
+ W.printHex("PaddingFrameBytes"<wbr>, FrameProc.PaddingFrameBytes);<br>
+ W.printHex("OffsetToPadding", FrameProc.OffsetToPadding);<br>
W.printHex("<wbr>BytesOfCalleeSavedRegisters",<br>
- FrameProc.Header.<wbr>BytesOfCalleeSavedRegisters);<br>
- W.printHex("<wbr>OffsetOfExceptionHandler",<br>
- FrameProc.Header.<wbr>OffsetOfExceptionHandler);<br>
+ FrameProc.<wbr>BytesOfCalleeSavedRegisters);<br>
+ W.printHex("<wbr>OffsetOfExceptionHandler", FrameProc.<wbr>OffsetOfExceptionHandler);<br>
W.printHex("<wbr>SectionIdOfExceptionHandler",<br>
- FrameProc.Header.<wbr>SectionIdOfExceptionHandler);<br>
- W.printFlags("Flags", FrameProc.Header.Flags, getFrameProcSymFlagNames());<br>
+ FrameProc.<wbr>SectionIdOfExceptionHandler);<br>
+ W.printFlags("Flags", static_cast<uint32_t>(<wbr>FrameProc.Flags),<br>
+ getFrameProcSymFlagNames());<br>
return Error::success();<br>
}<br>
<br>
@@ -453,13 +439,13 @@ Error CVSymbolDumperImpl::<wbr>visitKnownReco<br>
<br>
StringRef LinkageName;<br>
if (ObjDelegate) {<br>
- ObjDelegate-><wbr>printRelocatedField(<br>
- "CodeOffset", HeapAllocSite.<wbr>getRelocationOffset(),<br>
- HeapAllocSite.Header.<wbr>CodeOffset, &LinkageName);<br>
- }<br>
- W.printHex("Segment", HeapAllocSite.Header.Segment);<br>
- W.printHex("<wbr>CallInstructionSize", HeapAllocSite.Header.<wbr>CallInstructionSize);<br>
- CVTD.printTypeIndex("Type", HeapAllocSite.Header.Type);<br>
+ ObjDelegate-><wbr>printRelocatedField("<wbr>CodeOffset",<br>
+ HeapAllocSite.<wbr>getRelocationOffset(),<br>
+ HeapAllocSite.CodeOffset, &LinkageName);<br>
+ }<br>
+ W.printHex("Segment", HeapAllocSite.Segment);<br>
+ W.printHex("<wbr>CallInstructionSize", HeapAllocSite.<wbr>CallInstructionSize);<br>
+ CVTD.printTypeIndex("Type", HeapAllocSite.Type);<br>
if (!LinkageName.empty())<br>
W.printString("LinkageName", LinkageName);<br>
return Error::success();<br>
@@ -469,9 +455,9 @@ Error CVSymbolDumperImpl::<wbr>visitKnownReco<br>
InlineSiteSym &InlineSite) {<br>
DictScope S(W, "InlineSite");<br>
<br>
- W.printHex("PtrParent", InlineSite.Header.PtrParent);<br>
- W.printHex("PtrEnd", InlineSite.Header.PtrEnd);<br>
- CVTD.printTypeIndex("Inlinee", InlineSite.Header.Inlinee);<br>
+ W.printHex("PtrParent", InlineSite.Parent);<br>
+ W.printHex("PtrEnd", InlineSite.End);<br>
+ CVTD.printTypeIndex("Inlinee", InlineSite.Inlinee);<br>
<br>
ListScope BinaryAnnotations(W, "BinaryAnnotations");<br>
for (auto &Annotation : InlineSite.annotations()) {<br>
@@ -525,26 +511,26 @@ Error CVSymbolDumperImpl::<wbr>visitKnownReco<br>
Error CVSymbolDumperImpl::<wbr>visitKnownRecord(CVSymbol &CVR,<br>
RegisterSym &Register) {<br>
DictScope S(W, "RegisterSym");<br>
- W.printNumber("Type", Register.Header.Index);<br>
- W.printEnum("Seg", uint16_t(Register.Header.<wbr>Register), getRegisterNames());<br>
+ W.printNumber("Type", Register.Index);<br>
+ W.printEnum("Seg", uint16_t(Register.Register), getRegisterNames());<br>
W.printString("Name", Register.Name);<br>
return Error::success();<br>
}<br>
<br>
Error CVSymbolDumperImpl::<wbr>visitKnownRecord(CVSymbol &CVR, PublicSym32 &Public) {<br>
DictScope S(W, "PublicSym");<br>
- W.printNumber("Type", Public.Header.Index);<br>
- W.printNumber("Seg", Public.Header.Seg);<br>
- W.printNumber("Off", Public.Header.Off);<br>
+ W.printNumber("Type", Public.Index);<br>
+ W.printNumber("Seg", Public.Segment);<br>
+ W.printNumber("Off", Public.Offset);<br>
W.printString("Name", Public.Name);<br>
return Error::success();<br>
}<br>
<br>
Error CVSymbolDumperImpl::<wbr>visitKnownRecord(CVSymbol &CVR, ProcRefSym &ProcRef) {<br>
DictScope S(W, "ProcRef");<br>
- W.printNumber("SumName", ProcRef.Header.SumName);<br>
- W.printNumber("SymOffset", ProcRef.Header.SymOffset);<br>
- W.printNumber("Mod", ProcRef.Header.Mod);<br>
+ W.printNumber("SumName", ProcRef.SumName);<br>
+ W.printNumber("SymOffset", ProcRef.SymOffset);<br>
+ W.printNumber("Mod", ProcRef.Module);<br>
W.printString("Name", ProcRef.Name);<br>
return Error::success();<br>
}<br>
@@ -555,11 +541,11 @@ Error CVSymbolDumperImpl::<wbr>visitKnownReco<br>
StringRef LinkageName;<br>
if (ObjDelegate) {<br>
ObjDelegate-><wbr>printRelocatedField("<wbr>CodeOffset", Label.getRelocationOffset(),<br>
- Label.Header.CodeOffset, &LinkageName);<br>
+ Label.CodeOffset, &LinkageName);<br>
}<br>
- W.printHex("Segment", Label.Header.Segment);<br>
- W.printHex("Flags", Label.Header.Flags);<br>
- W.printFlags("Flags", Label.Header.Flags, getProcSymFlagNames());<br>
+ W.printHex("Segment", Label.Segment);<br>
+ W.printHex("Flags", uint8_t(Label.Flags));<br>
+ W.printFlags("Flags", uint8_t(Label.Flags), getProcSymFlagNames());<br>
W.printString("DisplayName", Label.Name);<br>
if (!LinkageName.empty())<br>
W.printString("LinkageName", LinkageName);<br>
@@ -569,8 +555,8 @@ Error CVSymbolDumperImpl::<wbr>visitKnownReco<br>
Error CVSymbolDumperImpl::<wbr>visitKnownRecord(CVSymbol &CVR, LocalSym &Local) {<br>
DictScope S(W, "Local");<br>
<br>
- CVTD.printTypeIndex("Type", Local.Header.Type);<br>
- W.printFlags("Flags", uint16_t(Local.Header.Flags), getLocalFlagNames());<br>
+ CVTD.printTypeIndex("Type", Local.Type);<br>
+ W.printFlags("Flags", uint16_t(Local.Flags), getLocalFlagNames());<br>
W.printString("VarName", Local.Name);<br>
return Error::success();<br>
}<br>
@@ -578,7 +564,7 @@ Error CVSymbolDumperImpl::<wbr>visitKnownReco<br>
Error CVSymbolDumperImpl::<wbr>visitKnownRecord(CVSymbol &CVR, ObjNameSym &ObjName) {<br>
DictScope S(W, "ObjectName");<br>
<br>
- W.printHex("Signature", ObjName.Header.Signature);<br>
+ W.printHex("Signature", ObjName.Signature);<br>
W.printString("ObjectName", ObjName.Name);<br>
return Error::success();<br>
}<br>
@@ -594,19 +580,19 @@ Error CVSymbolDumperImpl::<wbr>visitKnownReco<br>
<br>
StringRef LinkageName;<br>
W.printEnum("Kind", uint16_t(CVR.kind()), getSymbolTypeNames());<br>
- W.printHex("PtrParent", Proc.Header.PtrParent);<br>
- W.printHex("PtrEnd", Proc.Header.PtrEnd);<br>
- W.printHex("PtrNext", Proc.Header.PtrNext);<br>
- W.printHex("CodeSize", Proc.Header.CodeSize);<br>
- W.printHex("DbgStart", Proc.Header.DbgStart);<br>
- W.printHex("DbgEnd", Proc.Header.DbgEnd);<br>
- CVTD.printTypeIndex("<wbr>FunctionType", Proc.Header.FunctionType);<br>
+ W.printHex("PtrParent", Proc.Parent);<br>
+ W.printHex("PtrEnd", Proc.End);<br>
+ W.printHex("PtrNext", Proc.Next);<br>
+ W.printHex("CodeSize", Proc.CodeSize);<br>
+ W.printHex("DbgStart", Proc.DbgStart);<br>
+ W.printHex("DbgEnd", Proc.DbgEnd);<br>
+ CVTD.printTypeIndex("<wbr>FunctionType", Proc.FunctionType);<br>
if (ObjDelegate) {<br>
ObjDelegate-><wbr>printRelocatedField("<wbr>CodeOffset", Proc.getRelocationOffset(),<br>
- Proc.Header.CodeOffset, &LinkageName);<br>
+ Proc.CodeOffset, &LinkageName);<br>
}<br>
- W.printHex("Segment", Proc.Header.Segment);<br>
- W.printFlags("Flags", static_cast<uint8_t>(Proc.<wbr>Header.Flags),<br>
+ W.printHex("Segment", Proc.Segment);<br>
+ W.printFlags("Flags", static_cast<uint8_t>(Proc.<wbr>Flags),<br>
getProcSymFlagNames());<br>
W.printString("DisplayName", Proc.Name);<br>
if (!LinkageName.empty())<br>
@@ -638,9 +624,9 @@ Error CVSymbolDumperImpl::<wbr>visitKnownReco<br>
RegRelativeSym &RegRel) {<br>
DictScope S(W, "RegRelativeSym");<br>
<br>
- W.printHex("Offset", RegRel.Header.Offset);<br>
- CVTD.printTypeIndex("Type", RegRel.Header.Type);<br>
- W.printHex("Register", RegRel.Header.Register);<br>
+ W.printHex("Offset", RegRel.Offset);<br>
+ CVTD.printTypeIndex("Type", RegRel.Type);<br>
+ W.printHex("Register", RegRel.Register);<br>
W.printString("VarName", RegRel.Name);<br>
return Error::success();<br>
}<br>
@@ -652,9 +638,9 @@ Error CVSymbolDumperImpl::<wbr>visitKnownReco<br>
StringRef LinkageName;<br>
if (ObjDelegate) {<br>
ObjDelegate-><wbr>printRelocatedField("<wbr>DataOffset", Data.getRelocationOffset(),<br>
- Data.Header.DataOffset, &LinkageName);<br>
+ Data.DataOffset, &LinkageName);<br>
}<br>
- CVTD.printTypeIndex("Type", Data.Header.Type);<br>
+ CVTD.printTypeIndex("Type", Data.Type);<br>
W.printString("DisplayName", Data.Name);<br>
if (!LinkageName.empty())<br>
W.printString("LinkageName", LinkageName);<br>
@@ -663,7 +649,7 @@ Error CVSymbolDumperImpl::<wbr>visitKnownReco<br>
<br>
Error CVSymbolDumperImpl::<wbr>visitKnownRecord(CVSymbol &CVR, UDTSym &UDT) {<br>
DictScope S(W, "UDT");<br>
- CVTD.printTypeIndex("Type", UDT.Header.Type);<br>
+ CVTD.printTypeIndex("Type", UDT.Type);<br>
W.printString("UDTName", UDT.Name);<br>
return Error::success();<br>
}<br>
<br>
Added: llvm/trunk/lib/DebugInfo/<wbr>CodeView/SymbolRecordMapping.<wbr>cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/CodeView/SymbolRecordMapping.cpp?rev=290000&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/lib/<wbr>DebugInfo/CodeView/<wbr>SymbolRecordMapping.cpp?rev=<wbr>290000&view=auto</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/lib/DebugInfo/<wbr>CodeView/SymbolRecordMapping.<wbr>cpp (added)<br>
+++ llvm/trunk/lib/DebugInfo/<wbr>CodeView/SymbolRecordMapping.<wbr>cpp Fri Dec 16 16:48:14 2016<br>
@@ -0,0 +1,464 @@<br>
+//===- SymbolRecordMapping.cpp ------------------------------<wbr>-----*- C++-*-===//<br>
+//<br>
+// The LLVM Compiler Infrastructure<br>
+//<br>
+// This file is distributed under the University of Illinois Open Source<br>
+// License. See LICENSE.TXT for details.<br>
+//<br>
+//===------------------------<wbr>------------------------------<wbr>----------------===//<br>
+<br>
+#include "llvm/DebugInfo/CodeView/<wbr>SymbolRecordMapping.h"<br>
+<br>
+using namespace llvm;<br>
+using namespace llvm::codeview;<br>
+<br>
+#define error(X) \<br>
+ if (auto EC = X) \<br>
+ return EC;<br>
+<br>
+namespace {<br>
+struct MapGap {<br>
+ Error operator()(CodeViewRecordIO &IO, LocalVariableAddrGap &Gap) const {<br>
+ error(IO.mapInteger(Gap.<wbr>GapStartOffset));<br>
+ error(IO.mapInteger(Gap.Range)<wbr>);<br>
+ return Error::success();<br>
+ }<br>
+};<br>
+}<br>
+<br>
+static Error mapLocalVariableAddrRange(<wbr>CodeViewRecordIO &IO,<br>
+ LocalVariableAddrRange &Range) {<br>
+ error(IO.mapInteger(Range.<wbr>OffsetStart));<br>
+ error(IO.mapInteger(Range.<wbr>ISectStart));<br>
+ error(IO.mapInteger(Range.<wbr>Range));<br>
+ return Error::success();<br>
+}<br>
+<br>
+Error SymbolRecordMapping::<wbr>visitSymbolBegin(CVSymbol &Record) {<br>
+ error(IO.beginRecord(<wbr>MaxRecordLength - sizeof(RecordPrefix)));<br>
+ return Error::success();<br>
+}<br>
+<br>
+Error SymbolRecordMapping::<wbr>visitSymbolEnd(CVSymbol &Record) {<br>
+ error(IO.endRecord());<br>
+ return Error::success();<br>
+}<br>
+<br>
+Error SymbolRecordMapping::<wbr>visitKnownRecord(CVSymbol &CVR, BlockSym &Block) {<br>
+<br>
+ error(IO.mapInteger(Block.<wbr>Parent));<br>
+ error(IO.mapInteger(Block.End)<wbr>);<br>
+ error(IO.mapInteger(Block.<wbr>CodeSize));<br>
+ error(IO.mapInteger(Block.<wbr>CodeOffset));<br>
+ error(IO.mapInteger(Block.<wbr>Segment));<br>
+ error(IO.mapStringZ(Block.<wbr>Name));<br>
+<br>
+ return Error::success();<br>
+}<br>
+<br>
+Error SymbolRecordMapping::<wbr>visitKnownRecord(CVSymbol &CVR, Thunk32Sym &Thunk) {<br>
+<br>
+ error(IO.mapInteger(Thunk.<wbr>Parent));<br>
+ error(IO.mapInteger(Thunk.End)<wbr>);<br>
+ error(IO.mapInteger(Thunk.<wbr>Next));<br>
+ error(IO.mapInteger(Thunk.<wbr>Offset));<br>
+ error(IO.mapInteger(Thunk.<wbr>Segment));<br>
+ error(IO.mapInteger(Thunk.<wbr>Length));<br>
+ error(IO.mapEnum(Thunk.Thunk))<wbr>;<br>
+ error(IO.mapStringZ(Thunk.<wbr>Name));<br>
+ error(IO.mapByteVectorTail(<wbr>Thunk.VariantData));<br>
+<br>
+ return Error::success();<br>
+}<br>
+<br>
+Error SymbolRecordMapping::<wbr>visitKnownRecord(CVSymbol &CVR,<br>
+ TrampolineSym &Tramp) {<br>
+<br>
+ error(IO.mapEnum(Tramp.Type));<br>
+ error(IO.mapInteger(Tramp.<wbr>Size));<br>
+ error(IO.mapInteger(Tramp.<wbr>ThunkOffset));<br>
+ error(IO.mapInteger(Tramp.<wbr>TargetOffset));<br>
+ error(IO.mapInteger(Tramp.<wbr>ThunkSection));<br>
+ error(IO.mapInteger(Tramp.<wbr>TargetSection));<br>
+<br>
+ return Error::success();<br>
+}<br>
+<br>
+Error SymbolRecordMapping::<wbr>visitKnownRecord(CVSymbol &CVR,<br>
+ SectionSym &Section) {<br>
+ uint8_t Padding = 0;<br>
+<br>
+ error(IO.mapInteger(Section.<wbr>SectionNumber));<br>
+ error(IO.mapInteger(Section.<wbr>Alignment));<br>
+ error(IO.mapInteger(Padding));<br>
+ error(IO.mapInteger(Section.<wbr>Rva));<br>
+ error(IO.mapInteger(Section.<wbr>Length));<br>
+ error(IO.mapInteger(Section.<wbr>Characteristics));<br>
+ error(IO.mapStringZ(Section.<wbr>Name));<br>
+<br>
+ return Error::success();<br>
+}<br>
+<br>
+Error SymbolRecordMapping::<wbr>visitKnownRecord(CVSymbol &CVR,<br>
+ CoffGroupSym &CoffGroup) {<br>
+<br>
+ error(IO.mapInteger(CoffGroup.<wbr>Size));<br>
+ error(IO.mapInteger(CoffGroup.<wbr>Characteristics));<br>
+ error(IO.mapInteger(CoffGroup.<wbr>Offset));<br>
+ error(IO.mapInteger(CoffGroup.<wbr>Segment));<br>
+ error(IO.mapStringZ(CoffGroup.<wbr>Name));<br>
+<br>
+ return Error::success();<br>
+}<br>
+<br>
+Error SymbolRecordMapping::<wbr>visitKnownRecord(CVSymbol &CVR,<br>
+ BPRelativeSym &BPRel) {<br>
+<br>
+ error(IO.mapInteger(BPRel.<wbr>Offset));<br>
+ error(IO.mapInteger(BPRel.<wbr>Type));<br>
+ error(IO.mapStringZ(BPRel.<wbr>Name));<br>
+<br>
+ return Error::success();<br>
+}<br>
+<br>
+Error SymbolRecordMapping::<wbr>visitKnownRecord(CVSymbol &CVR,<br>
+ BuildInfoSym &BuildInfo) {<br>
+<br>
+ error(IO.mapInteger(BuildInfo.<wbr>BuildId));<br>
+<br>
+ return Error::success();<br>
+}<br>
+<br>
+Error SymbolRecordMapping::<wbr>visitKnownRecord(CVSymbol &CVR,<br>
+ CallSiteInfoSym &CallSiteInfo) {<br>
+ uint16_t Padding = 0;<br>
+<br>
+ error(IO.mapInteger(<wbr>CallSiteInfo.CodeOffset));<br>
+ error(IO.mapInteger(<wbr>CallSiteInfo.Segment));<br>
+ error(IO.mapInteger(Padding));<br>
+ error(IO.mapInteger(<wbr>CallSiteInfo.Type));<br>
+<br>
+ return Error::success();<br>
+}<br>
+<br>
+Error SymbolRecordMapping::<wbr>visitKnownRecord(CVSymbol &CVR,<br>
+ EnvBlockSym &EnvBlock) {<br>
+<br>
+ uint8_t Reserved = 0;<br>
+ error(IO.mapInteger(Reserved))<wbr>;<br>
+ error(IO.mapStringZVectorZ(<wbr>EnvBlock.Fields));<br>
+<br>
+ return Error::success();<br>
+}<br>
+<br>
+Error SymbolRecordMapping::<wbr>visitKnownRecord(CVSymbol &CVR,<br>
+ FileStaticSym &FileStatic) {<br>
+<br>
+ error(IO.mapInteger(<wbr>FileStatic.Index));<br>
+ error(IO.mapInteger(<wbr>FileStatic.ModFilenameOffset))<wbr>;<br>
+ error(IO.mapEnum(FileStatic.<wbr>Flags));<br>
+ error(IO.mapStringZ(<wbr>FileStatic.Name));<br>
+<br>
+ return Error::success();<br>
+}<br>
+<br>
+Error SymbolRecordMapping::<wbr>visitKnownRecord(CVSymbol &CVR, ExportSym &Export) {<br>
+<br>
+ error(IO.mapInteger(Export.<wbr>Ordinal));<br>
+ error(IO.mapEnum(Export.Flags)<wbr>);<br>
+ error(IO.mapStringZ(Export.<wbr>Name));<br>
+<br>
+ return Error::success();<br>
+}<br>
+<br>
+Error SymbolRecordMapping::<wbr>visitKnownRecord(CVSymbol &CVR,<br>
+ Compile2Sym &Compile2) {<br>
+<br>
+ error(IO.mapEnum(Compile2.<wbr>Flags));<br>
+ error(IO.mapEnum(Compile2.<wbr>Machine));<br>
+ error(IO.mapInteger(Compile2.<wbr>VersionFrontendMajor));<br>
+ error(IO.mapInteger(Compile2.<wbr>VersionFrontendMinor));<br>
+ error(IO.mapInteger(Compile2.<wbr>VersionFrontendBuild));<br>
+ error(IO.mapInteger(Compile2.<wbr>VersionBackendMajor));<br>
+ error(IO.mapInteger(Compile2.<wbr>VersionBackendMinor));<br>
+ error(IO.mapInteger(Compile2.<wbr>VersionBackendBuild));<br>
+ error(IO.mapStringZ(Compile2.<wbr>Version));<br>
+ error(IO.mapStringZVectorZ(<wbr>Compile2.ExtraStrings));<br>
+<br>
+ return Error::success();<br>
+}<br>
+<br>
+Error SymbolRecordMapping::<wbr>visitKnownRecord(CVSymbol &CVR,<br>
+ Compile3Sym &Compile3) {<br>
+<br>
+ error(IO.mapEnum(Compile3.<wbr>Flags));<br>
+ error(IO.mapEnum(Compile3.<wbr>Machine));<br>
+ error(IO.mapInteger(Compile3.<wbr>VersionFrontendMajor));<br>
+ error(IO.mapInteger(Compile3.<wbr>VersionFrontendMinor));<br>
+ error(IO.mapInteger(Compile3.<wbr>VersionFrontendBuild));<br>
+ error(IO.mapInteger(Compile3.<wbr>VersionFrontendQFE));<br>
+ error(IO.mapInteger(Compile3.<wbr>VersionBackendMajor));<br>
+ error(IO.mapInteger(Compile3.<wbr>VersionBackendMinor));<br>
+ error(IO.mapInteger(Compile3.<wbr>VersionBackendBuild));<br>
+ error(IO.mapInteger(Compile3.<wbr>VersionBackendQFE));<br>
+ error(IO.mapStringZ(Compile3.<wbr>Version));<br>
+<br>
+ return Error::success();<br>
+}<br>
+<br>
+Error SymbolRecordMapping::<wbr>visitKnownRecord(CVSymbol &CVR,<br>
+ ConstantSym &Constant) {<br>
+<br>
+ error(IO.mapInteger(Constant.<wbr>Type));<br>
+ error(IO.mapEncodedInteger(<wbr>Constant.Value));<br>
+ error(IO.mapStringZ(Constant.<wbr>Name));<br>
+<br>
+ return Error::success();<br>
+}<br>
+<br>
+Error SymbolRecordMapping::<wbr>visitKnownRecord(CVSymbol &CVR, DataSym &Data) {<br>
+<br>
+ error(IO.mapInteger(Data.Type)<wbr>);<br>
+ error(IO.mapInteger(Data.<wbr>DataOffset));<br>
+ error(IO.mapInteger(Data.<wbr>Segment));<br>
+ error(IO.mapStringZ(Data.Name)<wbr>);<br>
+<br>
+ return Error::success();<br>
+}<br>
+<br>
+Error SymbolRecordMapping::<wbr>visitKnownRecord(<br>
+ CVSymbol &CVR, DefRangeFramePointerRelSym &DefRangeFramePointerRel) {<br>
+<br>
+ error(IO.mapInteger(<wbr>DefRangeFramePointerRel.<wbr>Offset));<br>
+ error(<wbr>mapLocalVariableAddrRange(IO, DefRangeFramePointerRel.Range)<wbr>);<br>
+ error(IO.mapVectorTail(<wbr>DefRangeFramePointerRel.Gaps, MapGap()));<br>
+<br>
+ return Error::success();<br>
+}<br>
+<br>
+Error SymbolRecordMapping::<wbr>visitKnownRecord(<br>
+ CVSymbol &CVR,<br>
+ DefRangeFramePointerRelFullSco<wbr>peSym &<wbr>DefRangeFramePointerRelFullSco<wbr>pe) {<br>
+<br>
+ error(IO.mapInteger(<wbr>DefRangeFramePointerRelFullSco<wbr>pe.Offset));<br>
+<br>
+ return Error::success();<br>
+}<br>
+<br>
+Error SymbolRecordMapping::<wbr>visitKnownRecord(<br>
+ CVSymbol &CVR, DefRangeRegisterRelSym &DefRangeRegisterRel) {<br>
+<br>
+ error(IO.mapObject(<wbr>DefRangeRegisterRel.Hdr.<wbr>Register));<br>
+ error(IO.mapObject(<wbr>DefRangeRegisterRel.Hdr.Flags)<wbr>);<br>
+ error(IO.mapObject(<wbr>DefRangeRegisterRel.Hdr.<wbr>BasePointerOffset));<br>
+ error(<wbr>mapLocalVariableAddrRange(IO, DefRangeRegisterRel.Range));<br>
+ error(IO.mapVectorTail(<wbr>DefRangeRegisterRel.Gaps, MapGap()));<br>
+<br>
+ return Error::success();<br>
+}<br>
+<br>
+Error SymbolRecordMapping::<wbr>visitKnownRecord(<br>
+ CVSymbol &CVR, DefRangeRegisterSym &DefRangeRegister) {<br>
+<br>
+ error(IO.mapObject(<wbr>DefRangeRegister.Hdr.Register)<wbr>);<br>
+ error(IO.mapObject(<wbr>DefRangeRegister.Hdr.<wbr>MayHaveNoName));<br>
+ error(<wbr>mapLocalVariableAddrRange(IO, DefRangeRegister.Range));<br>
+ error(IO.mapVectorTail(<wbr>DefRangeRegister.Gaps, MapGap()));<br>
+<br>
+ return Error::success();<br>
+}<br>
+<br>
+Error SymbolRecordMapping::<wbr>visitKnownRecord(<br>
+ CVSymbol &CVR, DefRangeSubfieldRegisterSym &DefRangeSubfieldRegister) {<br>
+<br>
+ error(IO.mapObject(<wbr>DefRangeSubfieldRegister.Hdr.<wbr>Register));<br>
+ error(IO.mapObject(<wbr>DefRangeSubfieldRegister.Hdr.<wbr>MayHaveNoName));<br>
+ error(IO.mapObject(<wbr>DefRangeSubfieldRegister.Hdr.<wbr>OffsetInParent));<br>
+ error(<wbr>mapLocalVariableAddrRange(IO, DefRangeSubfieldRegister.<wbr>Range));<br>
+ error(IO.mapVectorTail(<wbr>DefRangeSubfieldRegister.Gaps, MapGap()));<br>
+<br>
+ return Error::success();<br>
+}<br>
+<br>
+Error SymbolRecordMapping::<wbr>visitKnownRecord(<br>
+ CVSymbol &CVR, DefRangeSubfieldSym &DefRangeSubfield) {<br>
+<br>
+ error(IO.mapInteger(<wbr>DefRangeSubfield.Program));<br>
+ error(IO.mapInteger(<wbr>DefRangeSubfield.<wbr>OffsetInParent));<br>
+ error(<wbr>mapLocalVariableAddrRange(IO, DefRangeSubfield.Range));<br>
+ error(IO.mapVectorTail(<wbr>DefRangeSubfield.Gaps, MapGap()));<br>
+<br>
+ return Error::success();<br>
+}<br>
+<br>
+Error SymbolRecordMapping::<wbr>visitKnownRecord(CVSymbol &CVR,<br>
+ DefRangeSym &DefRange) {<br>
+<br>
+ error(IO.mapInteger(DefRange.<wbr>Program));<br>
+ error(<wbr>mapLocalVariableAddrRange(IO, DefRange.Range));<br>
+ error(IO.mapVectorTail(<wbr>DefRange.Gaps, MapGap()));<br>
+<br>
+ return Error::success();<br>
+}<br>
+<br>
+Error SymbolRecordMapping::<wbr>visitKnownRecord(CVSymbol &CVR,<br>
+ FrameCookieSym &FrameCookie) {<br>
+<br>
+ error(IO.mapInteger(<wbr>FrameCookie.CodeOffset));<br>
+ error(IO.mapInteger(<wbr>FrameCookie.Register));<br>
+ error(IO.mapInteger(<wbr>FrameCookie.CookieKind));<br>
+ error(IO.mapInteger(<wbr>FrameCookie.Flags));<br>
+<br>
+ return Error::success();<br>
+}<br>
+<br>
+Error SymbolRecordMapping::<wbr>visitKnownRecord(CVSymbol &CVR,<br>
+ FrameProcSym &FrameProc) {<br>
+ error(IO.mapInteger(FrameProc.<wbr>TotalFrameBytes));<br>
+ error(IO.mapInteger(FrameProc.<wbr>PaddingFrameBytes));<br>
+ error(IO.mapInteger(FrameProc.<wbr>OffsetToPadding));<br>
+ error(IO.mapInteger(FrameProc.<wbr>BytesOfCalleeSavedRegisters));<br>
+ error(IO.mapInteger(FrameProc.<wbr>OffsetOfExceptionHandler));<br>
+ error(IO.mapInteger(FrameProc.<wbr>SectionIdOfExceptionHandler));<br>
+ error(IO.mapEnum(FrameProc.<wbr>Flags));<br>
+<br>
+ return Error::success();<br>
+}<br>
+<br>
+Error SymbolRecordMapping::<wbr>visitKnownRecord(<br>
+ CVSymbol &CVR, HeapAllocationSiteSym &HeapAllocSite) {<br>
+<br>
+ error(IO.mapInteger(<wbr>HeapAllocSite.CodeOffset));<br>
+ error(IO.mapInteger(<wbr>HeapAllocSite.Segment));<br>
+ error(IO.mapInteger(<wbr>HeapAllocSite.<wbr>CallInstructionSize));<br>
+ error(IO.mapInteger(<wbr>HeapAllocSite.Type));<br>
+<br>
+ return Error::success();<br>
+}<br>
+<br>
+Error SymbolRecordMapping::<wbr>visitKnownRecord(CVSymbol &CVR,<br>
+ InlineSiteSym &InlineSite) {<br>
+<br>
+ error(IO.mapInteger(<wbr>InlineSite.Parent));<br>
+ error(IO.mapInteger(<wbr>InlineSite.End));<br>
+ error(IO.mapInteger(<wbr>InlineSite.Inlinee));<br>
+ error(IO.mapByteVectorTail(<wbr>InlineSite.AnnotationData));<br>
+<br>
+ return Error::success();<br>
+}<br>
+<br>
+Error SymbolRecordMapping::<wbr>visitKnownRecord(CVSymbol &CVR,<br>
+ RegisterSym &Register) {<br>
+<br>
+ error(IO.mapInteger(Register.<wbr>Index));<br>
+ error(IO.mapEnum(Register.<wbr>Register));<br>
+ error(IO.mapStringZ(Register.<wbr>Name));<br>
+<br>
+ return Error::success();<br>
+}<br>
+<br>
+Error SymbolRecordMapping::<wbr>visitKnownRecord(CVSymbol &CVR,<br>
+ PublicSym32 &Public) {<br>
+<br>
+ error(IO.mapInteger(Public.<wbr>Index));<br>
+ error(IO.mapInteger(Public.<wbr>Offset));<br>
+ error(IO.mapInteger(Public.<wbr>Segment));<br>
+ error(IO.mapStringZ(Public.<wbr>Name));<br>
+<br>
+ return Error::success();<br>
+}<br>
+<br>
+Error SymbolRecordMapping::<wbr>visitKnownRecord(CVSymbol &CVR,<br>
+ ProcRefSym &ProcRef) {<br>
+<br>
+ error(IO.mapInteger(ProcRef.<wbr>SumName));<br>
+ error(IO.mapInteger(ProcRef.<wbr>SymOffset));<br>
+ error(IO.mapInteger(ProcRef.<wbr>Module));<br>
+ error(IO.mapStringZ(ProcRef.<wbr>Name));<br>
+<br>
+ return Error::success();<br>
+}<br>
+<br>
+Error SymbolRecordMapping::<wbr>visitKnownRecord(CVSymbol &CVR, LabelSym &Label) {<br>
+<br>
+ error(IO.mapInteger(Label.<wbr>CodeOffset));<br>
+ error(IO.mapInteger(Label.<wbr>Segment));<br>
+ error(IO.mapEnum(Label.Flags))<wbr>;<br>
+ error(IO.mapStringZ(Label.<wbr>Name));<br>
+<br>
+ return Error::success();<br>
+}<br>
+<br>
+Error SymbolRecordMapping::<wbr>visitKnownRecord(CVSymbol &CVR, LocalSym &Local) {<br>
+ error(IO.mapInteger(Local.<wbr>Type));<br>
+ error(IO.mapEnum(Local.Flags))<wbr>;<br>
+ error(IO.mapStringZ(Local.<wbr>Name));<br>
+<br>
+ return Error::success();<br>
+}<br>
+<br>
+Error SymbolRecordMapping::<wbr>visitKnownRecord(CVSymbol &CVR,<br>
+ ObjNameSym &ObjName) {<br>
+<br>
+ error(IO.mapInteger(ObjName.<wbr>Signature));<br>
+ error(IO.mapStringZ(ObjName.<wbr>Name));<br>
+<br>
+ return Error::success();<br>
+}<br>
+<br>
+Error SymbolRecordMapping::<wbr>visitKnownRecord(CVSymbol &CVR, ProcSym &Proc) {<br>
+ error(IO.mapInteger(Proc.<wbr>Parent));<br>
+ error(IO.mapInteger(Proc.End))<wbr>;<br>
+ error(IO.mapInteger(Proc.Next)<wbr>);<br>
+ error(IO.mapInteger(Proc.<wbr>CodeSize));<br>
+ error(IO.mapInteger(Proc.<wbr>DbgStart));<br>
+ error(IO.mapInteger(Proc.<wbr>DbgEnd));<br>
+ error(IO.mapInteger(Proc.<wbr>FunctionType));<br>
+ error(IO.mapInteger(Proc.<wbr>CodeOffset));<br>
+ error(IO.mapInteger(Proc.<wbr>Segment));<br>
+ error(IO.mapEnum(Proc.Flags));<br>
+ error(IO.mapStringZ(Proc.Name)<wbr>);<br>
+ return Error::success();<br>
+}<br>
+<br>
+Error SymbolRecordMapping::<wbr>visitKnownRecord(CVSymbol &CVR,<br>
+ ScopeEndSym &ScopeEnd) {<br>
+ return Error::success();<br>
+}<br>
+<br>
+Error SymbolRecordMapping::<wbr>visitKnownRecord(CVSymbol &CVR, CallerSym &Caller) {<br>
+ error(IO.mapVectorN<uint32_t>(<br>
+ Caller.Indices,<br>
+ [](CodeViewRecordIO &IO, TypeIndex &N) { return IO.mapInteger(N); }));<br>
+ return Error::success();<br>
+}<br>
+<br>
+Error SymbolRecordMapping::<wbr>visitKnownRecord(CVSymbol &CVR,<br>
+ RegRelativeSym &RegRel) {<br>
+<br>
+ error(IO.mapInteger(RegRel.<wbr>Offset));<br>
+ error(IO.mapInteger(RegRel.<wbr>Type));<br>
+ error(IO.mapInteger(RegRel.<wbr>Register));<br>
+ error(IO.mapStringZ(RegRel.<wbr>Name));<br>
+<br>
+ return Error::success();<br>
+}<br>
+<br>
+Error SymbolRecordMapping::<wbr>visitKnownRecord(CVSymbol &CVR,<br>
+ ThreadLocalDataSym &Data) {<br>
+<br>
+ error(IO.mapInteger(Data.Type)<wbr>);<br>
+ error(IO.mapInteger(Data.<wbr>DataOffset));<br>
+ error(IO.mapInteger(Data.<wbr>Segment));<br>
+ error(IO.mapStringZ(Data.Name)<wbr>);<br>
+<br>
+ return Error::success();<br>
+}<br>
+<br>
+Error SymbolRecordMapping::<wbr>visitKnownRecord(CVSymbol &CVR, UDTSym &UDT) {<br>
+<br>
+ error(IO.mapInteger(UDT.Type))<wbr>;<br>
+ error(IO.mapStringZ(UDT.Name))<wbr>;<br>
+<br>
+ return Error::success();<br>
+}<br>
<br>
Added: llvm/trunk/lib/DebugInfo/<wbr>CodeView/SymbolSerializer.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/CodeView/SymbolSerializer.cpp?rev=290000&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/lib/<wbr>DebugInfo/CodeView/<wbr>SymbolSerializer.cpp?rev=<wbr>290000&view=auto</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/lib/DebugInfo/<wbr>CodeView/SymbolSerializer.cpp (added)<br>
+++ llvm/trunk/lib/DebugInfo/<wbr>CodeView/SymbolSerializer.cpp Fri Dec 16 16:48:14 2016<br>
@@ -0,0 +1 @@<br>
+#include "llvm/DebugInfo/CodeView/<wbr>SymbolSerializer.h"<br>
\ No newline at end of file<br>
<br>
Modified: llvm/trunk/lib/MC/MCCodeView.<wbr>cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCCodeView.cpp?rev=290000&r1=289999&r2=290000&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/lib/MC/<wbr>MCCodeView.cpp?rev=290000&r1=<wbr>289999&r2=290000&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/lib/MC/MCCodeView.<wbr>cpp (original)<br>
+++ llvm/trunk/lib/MC/MCCodeView.<wbr>cpp Fri Dec 16 16:48:14 2016<br>
@@ -361,7 +361,9 @@ void CodeViewContext::<wbr>encodeInlineLineTa<br>
// Exit early if our line table would produce an oversized InlineSiteSym<br>
// record. Account for the ChangeCodeLength annotation emitted after the<br>
// loop ends.<br>
- size_t MaxBufferSize = MaxRecordLength - sizeof(InlineSiteSym::Hdr) - 8;<br>
+ constexpr uint32_t InlineSiteSize = 12;<br>
+ constexpr uint32_t AnnotationSize = 8;<br>
+ size_t MaxBufferSize = MaxRecordLength - InlineSiteSize - AnnotationSize;<br>
if (Buffer.size() >= MaxBufferSize)<br>
break;<br>
<br>
<br>
Modified: llvm/trunk/test/DebugInfo/PDB/<wbr>pdb-yaml-symbols.test<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/PDB/pdb-yaml-symbols.test?rev=290000&r1=289999&r2=290000&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/test/<wbr>DebugInfo/PDB/pdb-yaml-<wbr>symbols.test?rev=290000&r1=<wbr>289999&r2=290000&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/test/DebugInfo/PDB/<wbr>pdb-yaml-symbols.test (original)<br>
+++ llvm/trunk/test/DebugInfo/PDB/<wbr>pdb-yaml-symbols.test Fri Dec 16 16:48:14 2016<br>
@@ -35,8 +35,8 @@ YAML: Signature: 0<br>
YAML: ObjectName: 'd:\src\llvm\test\DebugInfo\<wbr>PDB\Inputs\empty.obj'<br>
YAML: - Kind: S_COMPILE3<br>
YAML: Compile3Sym:<br>
-YAML: Flags: 8193<br>
-YAML: Machine: 7<br>
+YAML: Flags: [ SecurityChecks ]<br>
+YAML: Machine: Pentium3<br>
YAML: FrontendMajor: 18<br>
YAML: FrontendMinor: 0<br>
YAML: FrontendBuild: 31101<br>
@@ -56,7 +56,7 @@ YAML: DbgStart: 3<br>
YAML: DbgEnd: 8<br>
YAML: FunctionType: 4097<br>
YAML: Segment: 1<br>
-YAML: Flags: 1<br>
+YAML: Flags: [ HasFP ]<br>
YAML: DisplayName: main<br>
YAML: - Kind: S_FRAMEPROC<br>
YAML: FrameProcSym:<br>
@@ -66,7 +66,7 @@ YAML: OffsetToPadding: 0<br>
YAML: BytesOfCalleeSavedRegisters: 0<br>
YAML: OffsetOfExceptionHandler: 0<br>
YAML: SectionIdOfExceptionHandler: 0<br>
-YAML: Flags: 1212928<br>
+YAML: Flags: [ AsynchronousExceptionHandling, OptimizedForSpeed ]<br>
YAML: - Kind: S_END<br>
YAML: ScopeEndSym:<br>
YAML: - Kind: S_BUILDINFO<br>
@@ -83,8 +83,8 @@ YAML: Signature: 0<br>
YAML: ObjectName: '* Linker *'<br>
YAML: - Kind: S_COMPILE3<br>
YAML: Compile3Sym:<br>
-YAML: Flags: 7<br>
-YAML: Machine: 3<br>
+YAML: Flags: [ ]<br>
+YAML: Machine: Intel80386<br>
YAML: FrontendMajor: 0<br>
YAML: FrontendMinor: 0<br>
YAML: FrontendBuild: 0<br>
@@ -96,7 +96,6 @@ YAML: BackendQFE: 0<br>
YAML: Version: 'Microsoft (R) LINK'<br>
YAML: - Kind: S_ENVBLOCK<br>
YAML: EnvBlockSym:<br>
-YAML: Reserved: 0<br>
YAML: Entries:<br>
YAML: - cwd<br>
YAML: - 'd:\src\llvm\test\DebugInfo\<wbr>PDB\Inputs'<br>
@@ -106,7 +105,7 @@ YAML: - pdb<br>
YAML: - 'd:\src\llvm\test\DebugInfo\<wbr>PDB\Inputs\empty.pdb'<br>
YAML: - Kind: S_TRAMPOLINE<br>
YAML: TrampolineSym:<br>
-YAML: Type: 0<br>
+YAML: Type: TrampIncremental<br>
YAML: Size: 5<br>
YAML: ThunkOff: 5<br>
YAML: TargetOff: 16<br>
@@ -116,7 +115,6 @@ YAML: - Kind: S_SEC<br>
YAML: SectionSym:<br>
YAML: SectionNumber: 1<br>
YAML: Alignment: 12<br>
-YAML: Reserved: 0<br>
YAML: Rva: 4096<br>
YAML: Length: 4122<br>
YAML: Characteristics: 1610612768<br>
@@ -132,7 +130,6 @@ YAML: - Kind: S_SEC<br>
YAML: SectionSym:<br>
YAML: SectionNumber: 2<br>
YAML: Alignment: 12<br>
-YAML: Reserved: 0<br>
YAML: Rva: 12288<br>
YAML: Length: 690<br>
YAML: Characteristics: 1073741888<br>
@@ -162,7 +159,6 @@ YAML: - Kind: S_SEC<br>
YAML: SectionSym:<br>
YAML: SectionNumber: 3<br>
YAML: Alignment: 12<br>
-YAML: Reserved: 0<br>
YAML: Rva: 16384<br>
YAML: Length: 4<br>
YAML: Characteristics: 3221225536<br>
@@ -178,7 +174,6 @@ YAML: - Kind: S_SEC<br>
YAML: SectionSym:<br>
YAML: SectionNumber: 4<br>
YAML: Alignment: 12<br>
-YAML: Reserved: 0<br>
YAML: Rva: 20480<br>
YAML: Length: 8<br>
YAML: Characteristics: 1107296320<br>
<br>
Modified: llvm/trunk/test/DebugInfo/PDB/<wbr>pdbdump-headers.test<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/PDB/pdbdump-headers.test?rev=290000&r1=289999&r2=290000&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/test/<wbr>DebugInfo/PDB/pdbdump-headers.<wbr>test?rev=290000&r1=289999&r2=<wbr>290000&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/test/DebugInfo/PDB/<wbr>pdbdump-headers.test (original)<br>
+++ llvm/trunk/test/DebugInfo/PDB/<wbr>pdbdump-headers.test Fri Dec 16 16:48:14 2016<br>
@@ -417,7 +417,6 @@<br>
; EMPTY-NEXT: }<br>
; EMPTY-NEXT: {<br>
; EMPTY-NEXT: EnvBlock {<br>
-; EMPTY-NEXT: Reserved: 0<br>
; EMPTY-NEXT: Entries [<br>
; EMPTY-NEXT: cwd<br>
; EMPTY-NEXT: d:\src\llvm\test\DebugInfo\<wbr>PDB\Inputs<br>
@@ -458,7 +457,6 @@<br>
; EMPTY-NEXT: Section {<br>
; EMPTY-NEXT: SectionNumber: 1<br>
; EMPTY-NEXT: Alignment: 12<br>
-; EMPTY-NEXT: Reserved: 0<br>
; EMPTY-NEXT: Rva: 4096<br>
; EMPTY-NEXT: Length: 4122<br>
; EMPTY-NEXT: Characteristics [ (0x60000020)<br>
@@ -494,7 +492,6 @@<br>
; EMPTY-NEXT: Section {<br>
; EMPTY-NEXT: SectionNumber: 2<br>
; EMPTY-NEXT: Alignment: 12<br>
-; EMPTY-NEXT: Reserved: 0<br>
; EMPTY-NEXT: Rva: 12288<br>
; EMPTY-NEXT: Length: 690<br>
; EMPTY-NEXT: Characteristics [ (0x40000040)<br>
@@ -560,7 +557,6 @@<br>
; EMPTY-NEXT: Section {<br>
; EMPTY-NEXT: SectionNumber: 3<br>
; EMPTY-NEXT: Alignment: 12<br>
-; EMPTY-NEXT: Reserved: 0<br>
; EMPTY-NEXT: Rva: 16384<br>
; EMPTY-NEXT: Length: 4<br>
; EMPTY-NEXT: Characteristics [ (0xC0000040)<br>
@@ -596,7 +592,6 @@<br>
; EMPTY-NEXT: Section {<br>
; EMPTY-NEXT: SectionNumber: 4<br>
; EMPTY-NEXT: Alignment: 12<br>
-; EMPTY-NEXT: Reserved: 0<br>
; EMPTY-NEXT: Rva: 20480<br>
; EMPTY-NEXT: Length: 8<br>
; EMPTY-NEXT: Characteristics [ (0x42000040)<br>
@@ -1255,7 +1250,6 @@<br>
; ALL: }<br>
; ALL: {<br>
; ALL: EnvBlock {<br>
-; ALL: Reserved: 0<br>
; ALL: Entries [<br>
; ALL: cwd<br>
; ALL: d:\src\llvm\test\DebugInfo\<wbr>PDB\Inputs<br>
@@ -1280,7 +1274,6 @@<br>
; ALL: Section {<br>
; ALL: SectionNumber: 1<br>
; ALL: Alignment: 12<br>
-; ALL: Reserved: 0<br>
; ALL: Rva: 4096<br>
; ALL: Length: 4122<br>
; ALL: Characteristics [ (0x60000020)<br>
@@ -1308,7 +1301,6 @@<br>
; ALL: Section {<br>
; ALL: SectionNumber: 2<br>
; ALL: Alignment: 12<br>
-; ALL: Reserved: 0<br>
; ALL: Rva: 12288<br>
; ALL: Length: 690<br>
; ALL: Characteristics [ (0x40000040)<br>
@@ -1358,7 +1350,6 @@<br>
; ALL: Section {<br>
; ALL: SectionNumber: 3<br>
; ALL: Alignment: 12<br>
-; ALL: Reserved: 0<br>
; ALL: Rva: 16384<br>
; ALL: Length: 4<br>
; ALL: Characteristics [ (0xC0000040)<br>
@@ -1386,7 +1377,6 @@<br>
; ALL: Section {<br>
; ALL: SectionNumber: 4<br>
; ALL: Alignment: 12<br>
-; ALL: Reserved: 0<br>
; ALL: Rva: 20480<br>
; ALL: Length: 8<br>
; ALL: Characteristics [ (0x42000040)<br>
<br>
Modified: llvm/trunk/tools/llvm-pdbdump/<wbr>YamlSymbolDumper.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-pdbdump/YamlSymbolDumper.cpp?rev=290000&r1=289999&r2=290000&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/tools/llvm-<wbr>pdbdump/YamlSymbolDumper.cpp?<wbr>rev=290000&r1=289999&r2=<wbr>290000&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/tools/llvm-pdbdump/<wbr>YamlSymbolDumper.cpp (original)<br>
+++ llvm/trunk/tools/llvm-pdbdump/<wbr>YamlSymbolDumper.cpp Fri Dec 16 16:48:14 2016<br>
@@ -38,105 +38,197 @@ void ScalarEnumerationTraits<<wbr>SymbolKind><br>
io.enumCase(Value, E.Name.str().c_str(), E.Value);<br>
}<br>
<br>
+template <> struct ScalarBitSetTraits<<wbr>CompileSym2Flags> {<br>
+ static void bitset(IO &io, CompileSym2Flags &Flags) {<br>
+ auto FlagNames = getCompileSym2FlagNames();<br>
+ for (const auto &E : FlagNames) {<br>
+ io.bitSetCase(Flags, E.Name.str().c_str(),<br>
+ static_cast<CompileSym2Flags>(<wbr>E.Value));<br>
+ }<br>
+ }<br>
+};<br>
+<br>
+template <> struct ScalarBitSetTraits<<wbr>CompileSym3Flags> {<br>
+ static void bitset(IO &io, CompileSym3Flags &Flags) {<br>
+ auto FlagNames = getCompileSym3FlagNames();<br>
+ for (const auto &E : FlagNames) {<br>
+ io.bitSetCase(Flags, E.Name.str().c_str(),<br>
+ static_cast<CompileSym3Flags>(<wbr>E.Value));<br>
+ }<br>
+ }<br>
+};<br>
+<br>
+template <> struct ScalarBitSetTraits<<wbr>ExportFlags> {<br>
+ static void bitset(IO &io, ExportFlags &Flags) {<br>
+ auto FlagNames = getExportSymFlagNames();<br>
+ for (const auto &E : FlagNames) {<br>
+ io.bitSetCase(Flags, E.Name.str().c_str(),<br>
+ static_cast<ExportFlags>(E.<wbr>Value));<br>
+ }<br>
+ }<br>
+};<br>
+<br>
+template <> struct ScalarBitSetTraits<<wbr>LocalSymFlags> {<br>
+ static void bitset(IO &io, LocalSymFlags &Flags) {<br>
+ auto FlagNames = getLocalFlagNames();<br>
+ for (const auto &E : FlagNames) {<br>
+ io.bitSetCase(Flags, E.Name.str().c_str(),<br>
+ static_cast<LocalSymFlags>(E.<wbr>Value));<br>
+ }<br>
+ }<br>
+};<br>
+<br>
+template <> struct ScalarBitSetTraits<<wbr>ProcSymFlags> {<br>
+ static void bitset(IO &io, ProcSymFlags &Flags) {<br>
+ auto FlagNames = getProcSymFlagNames();<br>
+ for (const auto &E : FlagNames) {<br>
+ io.bitSetCase(Flags, E.Name.str().c_str(),<br>
+ static_cast<ProcSymFlags>(E.<wbr>Value));<br>
+ }<br>
+ }<br>
+};<br>
+<br>
+template <> struct ScalarBitSetTraits<<wbr>FrameProcedureOptions> {<br>
+ static void bitset(IO &io, FrameProcedureOptions &Flags) {<br>
+ auto FlagNames = getFrameProcSymFlagNames();<br>
+ for (const auto &E : FlagNames) {<br>
+ io.bitSetCase(Flags, E.Name.str().c_str(),<br>
+ static_cast<<wbr>FrameProcedureOptions>(E.<wbr>Value));<br>
+ }<br>
+ }<br>
+};<br>
+<br>
+template <> struct ScalarEnumerationTraits<<wbr>CPUType> {<br>
+ static void enumeration(IO &io, CPUType &Cpu) {<br>
+ auto CpuNames = getCPUTypeNames();<br>
+ for (const auto &E : CpuNames) {<br>
+ io.enumCase(Cpu, E.Name.str().c_str(), static_cast<CPUType>(E.Value))<wbr>;<br>
+ }<br>
+ }<br>
+};<br>
+<br>
+template <> struct ScalarEnumerationTraits<<wbr>RegisterId> {<br>
+ static void enumeration(IO &io, RegisterId &Reg) {<br>
+ auto RegNames = getRegisterNames();<br>
+ for (const auto &E : RegNames) {<br>
+ io.enumCase(Reg, E.Name.str().c_str(), static_cast<RegisterId>(E.<wbr>Value));<br>
+ }<br>
+ }<br>
+};<br>
+<br>
+template <> struct ScalarEnumerationTraits<<wbr>TrampolineType> {<br>
+ static void enumeration(IO &io, TrampolineType &Tramp) {<br>
+ auto TrampNames = getTrampolineNames();<br>
+ for (const auto &E : TrampNames) {<br>
+ io.enumCase(Tramp, E.Name.str().c_str(),<br>
+ static_cast<TrampolineType>(E.<wbr>Value));<br>
+ }<br>
+ }<br>
+};<br>
+<br>
template <> struct ScalarEnumerationTraits<<wbr>ThunkOrdinal> {<br>
- void enumeration(IO &io, ThunkOrdinal Ord) {}<br>
+ static void enumeration(IO &io, ThunkOrdinal &Ord) {<br>
+ auto ThunkNames = getThunkOrdinalNames();<br>
+ for (const auto &E : ThunkNames) {<br>
+ io.enumCase(Ord, E.Name.str().c_str(),<br>
+ static_cast<ThunkOrdinal>(E.<wbr>Value));<br>
+ }<br>
+ }<br>
};<br>
<br>
void MappingTraits<ScopeEndSym>::<wbr>mapping(IO &IO, ScopeEndSym &Obj) {}<br>
<br>
void MappingTraits<Thunk32Sym>::<wbr>mapping(IO &IO, Thunk32Sym &Thunk) {<br>
- IO.mapRequired("Parent", Thunk.Header.Parent);<br>
- IO.mapRequired("End", Thunk.Header.End);<br>
- IO.mapRequired("Next", Thunk.Header.Next);<br>
- IO.mapRequired("Off", Thunk.Header.Off);<br>
- IO.mapRequired("Seg", Thunk.Header.Seg);<br>
- IO.mapRequired("Len", Thunk.Header.Len);<br>
- IO.mapRequired("Ordinal", Thunk.Header.Ord);<br>
+ IO.mapRequired("Parent", Thunk.Parent);<br>
+ IO.mapRequired("End", Thunk.End);<br>
+ IO.mapRequired("Next", Thunk.Next);<br>
+ IO.mapRequired("Off", Thunk.Offset);<br>
+ IO.mapRequired("Seg", Thunk.Segment);<br>
+ IO.mapRequired("Len", Thunk.Length);<br>
+ IO.mapRequired("Ordinal", Thunk.Thunk);<br>
}<br>
<br>
void MappingTraits<TrampolineSym>::<wbr>mapping(IO &IO, TrampolineSym &Tramp) {<br>
- IO.mapRequired("Type", Tramp.Header.Type);<br>
- IO.mapRequired("Size", Tramp.Header.Size);<br>
- IO.mapRequired("ThunkOff", Tramp.Header.ThunkOff);<br>
- IO.mapRequired("TargetOff", Tramp.Header.TargetOff);<br>
- IO.mapRequired("ThunkSection", Tramp.Header.ThunkSection);<br>
- IO.mapRequired("TargetSection"<wbr>, Tramp.Header.TargetSection);<br>
+ IO.mapRequired("Type", Tramp.Type);<br>
+ IO.mapRequired("Size", Tramp.Size);<br>
+ IO.mapRequired("ThunkOff", Tramp.ThunkOffset);<br>
+ IO.mapRequired("TargetOff", Tramp.TargetOffset);<br>
+ IO.mapRequired("ThunkSection", Tramp.ThunkSection);<br>
+ IO.mapRequired("TargetSection"<wbr>, Tramp.TargetSection);<br>
}<br>
<br>
void MappingTraits<SectionSym>::<wbr>mapping(IO &IO, SectionSym &Section) {<br>
- IO.mapRequired("SectionNumber"<wbr>, Section.Header.SectionNumber);<br>
- IO.mapRequired("Alignment", Section.Header.Alignment);<br>
- IO.mapRequired("Reserved", Section.Header.Reserved);<br>
- IO.mapRequired("Rva", Section.Header.Rva);<br>
- IO.mapRequired("Length", Section.Header.Length);<br>
- IO.mapRequired("<wbr>Characteristics", Section.Header.<wbr>Characteristics);<br>
+ IO.mapRequired("SectionNumber"<wbr>, Section.SectionNumber);<br>
+ IO.mapRequired("Alignment", Section.Alignment);<br>
+ IO.mapRequired("Rva", Section.Rva);<br>
+ IO.mapRequired("Length", Section.Length);<br>
+ IO.mapRequired("<wbr>Characteristics", Section.Characteristics);<br>
IO.mapRequired("Name", Section.Name);<br>
}<br>
<br>
void MappingTraits<CoffGroupSym>::<wbr>mapping(IO &IO, CoffGroupSym &CoffGroup) {<br>
- IO.mapRequired("Size", CoffGroup.Header.Size);<br>
- IO.mapRequired("<wbr>Characteristics", CoffGroup.Header.<wbr>Characteristics);<br>
- IO.mapRequired("Offset", CoffGroup.Header.Offset);<br>
- IO.mapRequired("Segment", CoffGroup.Header.Segment);<br>
+ IO.mapRequired("Size", CoffGroup.Size);<br>
+ IO.mapRequired("<wbr>Characteristics", CoffGroup.Characteristics);<br>
+ IO.mapRequired("Offset", CoffGroup.Offset);<br>
+ IO.mapRequired("Segment", CoffGroup.Segment);<br>
IO.mapRequired("Name", CoffGroup.Name);<br>
}<br>
<br>
void MappingTraits<ExportSym>::<wbr>mapping(IO &IO, ExportSym &Export) {<br>
- IO.mapRequired("Ordinal", Export.Header.Ordinal);<br>
- IO.mapRequired("Flags", Export.Header.Flags);<br>
+ IO.mapRequired("Ordinal", Export.Ordinal);<br>
+ IO.mapRequired("Flags", Export.Flags);<br>
IO.mapRequired("Name", Export.Name);<br>
}<br>
<br>
void MappingTraits<ProcSym>::<wbr>mapping(IO &IO, ProcSym &Proc) {<br>
// TODO: Print the linkage name<br>
<br>
- IO.mapRequired("PtrParent", Proc.Header.PtrParent);<br>
- IO.mapRequired("PtrEnd", Proc.Header.PtrEnd);<br>
- IO.mapRequired("PtrNext", Proc.Header.PtrNext);<br>
- IO.mapRequired("CodeSize", Proc.Header.CodeSize);<br>
- IO.mapRequired("DbgStart", Proc.Header.DbgStart);<br>
- IO.mapRequired("DbgEnd", Proc.Header.DbgEnd);<br>
- IO.mapRequired("FunctionType", Proc.Header.FunctionType);<br>
- IO.mapRequired("Segment", Proc.Header.Segment);<br>
- IO.mapRequired("Flags", Proc.Header.Flags);<br>
+ IO.mapRequired("PtrParent", Proc.Parent);<br>
+ IO.mapRequired("PtrEnd", Proc.End);<br>
+ IO.mapRequired("PtrNext", Proc.Next);<br>
+ IO.mapRequired("CodeSize", Proc.CodeSize);<br>
+ IO.mapRequired("DbgStart", Proc.DbgStart);<br>
+ IO.mapRequired("DbgEnd", Proc.DbgEnd);<br>
+ IO.mapRequired("FunctionType", Proc.FunctionType);<br>
+ IO.mapRequired("Segment", Proc.Segment);<br>
+ IO.mapRequired("Flags", Proc.Flags);<br>
IO.mapRequired("DisplayName", Proc.Name);<br>
}<br>
<br>
void MappingTraits<RegisterSym>::<wbr>mapping(IO &IO, RegisterSym &Register) {<br>
- IO.mapRequired("Type", Register.Header.Index);<br>
- IO.mapRequired("Seg", Register.Header.Register);<br>
+ IO.mapRequired("Type", Register.Index);<br>
+ IO.mapRequired("Seg", Register.Register);<br>
IO.mapRequired("Name", Register.Name);<br>
}<br>
<br>
void MappingTraits<PublicSym32>::<wbr>mapping(IO &IO, PublicSym32 &Public) {<br>
- IO.mapRequired("Type", Public.Header.Index);<br>
- IO.mapRequired("Seg", Public.Header.Seg);<br>
- IO.mapRequired("Off", Public.Header.Off);<br>
+ IO.mapRequired("Type", Public.Index);<br>
+ IO.mapRequired("Seg", Public.Segment);<br>
+ IO.mapRequired("Off", Public.Offset);<br>
IO.mapRequired("Name", Public.Name);<br>
}<br>
<br>
void MappingTraits<ProcRefSym>::<wbr>mapping(IO &IO, ProcRefSym &ProcRef) {<br>
- IO.mapRequired("SumName", ProcRef.Header.SumName);<br>
- IO.mapRequired("SymOffset", ProcRef.Header.SymOffset);<br>
- IO.mapRequired("Mod", ProcRef.Header.Mod);<br>
+ IO.mapRequired("SumName", ProcRef.SumName);<br>
+ IO.mapRequired("SymOffset", ProcRef.SymOffset);<br>
+ IO.mapRequired("Mod", ProcRef.Module);<br>
IO.mapRequired("Name", ProcRef.Name);<br>
}<br>
<br>
void MappingTraits<EnvBlockSym>::<wbr>mapping(IO &IO, EnvBlockSym &EnvBlock) {<br>
- IO.mapRequired("Reserved", EnvBlock.Header.Reserved);<br>
IO.mapRequired("Entries", EnvBlock.Fields);<br>
}<br>
<br>
void MappingTraits<InlineSiteSym>::<wbr>mapping(IO &IO, InlineSiteSym &InlineSite) {<br>
- IO.mapRequired("PtrParent", InlineSite.Header.PtrParent);<br>
- IO.mapRequired("PtrEnd", InlineSite.Header.PtrEnd);<br>
- IO.mapRequired("Inlinee", InlineSite.Header.Inlinee);<br>
+ IO.mapRequired("PtrParent", InlineSite.Parent);<br>
+ IO.mapRequired("PtrEnd", InlineSite.End);<br>
+ IO.mapRequired("Inlinee", InlineSite.Inlinee);<br>
// TODO: The binary annotations<br>
}<br>
<br>
void MappingTraits<LocalSym>::<wbr>mapping(IO &IO, LocalSym &Local) {<br>
- IO.mapRequired("Type", Local.Header.Type);<br>
- IO.mapRequired("Flags", Local.Header.Flags);<br>
+ IO.mapRequired("Type", Local.Type);<br>
+ IO.mapRequired("Flags", Local.Flags);<br>
IO.mapRequired("VarName", Local.Name);<br>
}<br>
<br>
@@ -176,95 +268,93 @@ void MappingTraits<<wbr>DefRangeRegisterRelSy<br>
<br>
void MappingTraits<BlockSym>::<wbr>mapping(IO &IO, BlockSym &Block) {<br>
// TODO: Print the linkage name<br>
- IO.mapRequired("PtrParent", Block.Header.PtrParent);<br>
- IO.mapRequired("PtrEnd", Block.Header.PtrEnd);<br>
- IO.mapRequired("CodeSize", Block.Header.CodeSize);<br>
- IO.mapRequired("Segment", Block.Header.Segment);<br>
+ IO.mapRequired("PtrParent", Block.Parent);<br>
+ IO.mapRequired("PtrEnd", Block.End);<br>
+ IO.mapRequired("CodeSize", Block.CodeSize);<br>
+ IO.mapRequired("Segment", Block.Segment);<br>
IO.mapRequired("BlockName", Block.Name);<br>
}<br>
<br>
void MappingTraits<LabelSym>::<wbr>mapping(IO &IO, LabelSym &Label) {<br>
// TODO: Print the linkage name<br>
- IO.mapRequired("Segment", Label.Header.Segment);<br>
- IO.mapRequired("Flags", Label.Header.Flags);<br>
- IO.mapRequired("Flags", Label.Header.Flags);<br>
+ IO.mapRequired("Segment", Label.Segment);<br>
+ IO.mapRequired("Flags", Label.Flags);<br>
+ IO.mapRequired("Flags", Label.Flags);<br>
IO.mapRequired("DisplayName", Label.Name);<br>
}<br>
<br>
void MappingTraits<ObjNameSym>::<wbr>mapping(IO &IO, ObjNameSym &ObjName) {<br>
- IO.mapRequired("Signature", ObjName.Header.Signature);<br>
+ IO.mapRequired("Signature", ObjName.Signature);<br>
IO.mapRequired("ObjectName", ObjName.Name);<br>
}<br>
<br>
void MappingTraits<Compile2Sym>::<wbr>mapping(IO &IO, Compile2Sym &Compile2) {<br>
- IO.mapRequired("Flags", Compile2.Header.flags);<br>
- IO.mapRequired("Machine", Compile2.Header.Machine);<br>
- IO.mapRequired("FrontendMajor"<wbr>, Compile2.Header.<wbr>VersionFrontendMajor);<br>
- IO.mapRequired("FrontendMinor"<wbr>, Compile2.Header.<wbr>VersionFrontendMinor);<br>
- IO.mapRequired("FrontendBuild"<wbr>, Compile2.Header.<wbr>VersionFrontendBuild);<br>
- IO.mapRequired("BackendMajor", Compile2.Header.<wbr>VersionBackendMajor);<br>
- IO.mapRequired("BackendMinor", Compile2.Header.<wbr>VersionBackendMinor);<br>
- IO.mapRequired("BackendBuild", Compile2.Header.<wbr>VersionBackendBuild);<br>
+ IO.mapRequired("Flags", Compile2.Flags);<br>
+ IO.mapRequired("Machine", Compile2.Machine);<br>
+ IO.mapRequired("FrontendMajor"<wbr>, Compile2.VersionFrontendMajor)<wbr>;<br>
+ IO.mapRequired("FrontendMinor"<wbr>, Compile2.VersionFrontendMinor)<wbr>;<br>
+ IO.mapRequired("FrontendBuild"<wbr>, Compile2.VersionFrontendBuild)<wbr>;<br>
+ IO.mapRequired("BackendMajor", Compile2.VersionBackendMajor);<br>
+ IO.mapRequired("BackendMinor", Compile2.VersionBackendMinor);<br>
+ IO.mapRequired("BackendBuild", Compile2.VersionBackendBuild);<br>
IO.mapRequired("Version", Compile2.Version);<br>
}<br>
<br>
void MappingTraits<Compile3Sym>::<wbr>mapping(IO &IO, Compile3Sym &Compile3) {<br>
- IO.mapRequired("Flags", Compile3.Header.flags);<br>
- IO.mapRequired("Machine", Compile3.Header.Machine);<br>
- IO.mapRequired("FrontendMajor"<wbr>, Compile3.Header.<wbr>VersionFrontendMajor);<br>
- IO.mapRequired("FrontendMinor"<wbr>, Compile3.Header.<wbr>VersionFrontendMinor);<br>
- IO.mapRequired("FrontendBuild"<wbr>, Compile3.Header.<wbr>VersionFrontendBuild);<br>
- IO.mapRequired("FrontendQFE", Compile3.Header.<wbr>VersionFrontendQFE);<br>
- IO.mapRequired("BackendMajor", Compile3.Header.<wbr>VersionBackendMajor);<br>
- IO.mapRequired("BackendMinor", Compile3.Header.<wbr>VersionBackendMinor);<br>
- IO.mapRequired("BackendBuild", Compile3.Header.<wbr>VersionBackendBuild);<br>
- IO.mapRequired("BackendQFE", Compile3.Header.<wbr>VersionBackendQFE);<br>
+ IO.mapRequired("Flags", Compile3.Flags);<br>
+ IO.mapRequired("Machine", Compile3.Machine);<br>
+ IO.mapRequired("FrontendMajor"<wbr>, Compile3.VersionFrontendMajor)<wbr>;<br>
+ IO.mapRequired("FrontendMinor"<wbr>, Compile3.VersionFrontendMinor)<wbr>;<br>
+ IO.mapRequired("FrontendBuild"<wbr>, Compile3.VersionFrontendBuild)<wbr>;<br>
+ IO.mapRequired("FrontendQFE", Compile3.VersionFrontendQFE);<br>
+ IO.mapRequired("BackendMajor", Compile3.VersionBackendMajor);<br>
+ IO.mapRequired("BackendMinor", Compile3.VersionBackendMinor);<br>
+ IO.mapRequired("BackendBuild", Compile3.VersionBackendBuild);<br>
+ IO.mapRequired("BackendQFE", Compile3.VersionBackendQFE);<br>
IO.mapRequired("Version", Compile3.Version);<br>
}<br>
<br>
void MappingTraits<FrameProcSym>::<wbr>mapping(IO &IO, FrameProcSym &FrameProc) {<br>
- IO.mapRequired("<wbr>TotalFrameBytes", FrameProc.Header.<wbr>TotalFrameBytes);<br>
- IO.mapRequired("<wbr>PaddingFrameBytes", FrameProc.Header.<wbr>PaddingFrameBytes);<br>
- IO.mapRequired("<wbr>OffsetToPadding", FrameProc.Header.<wbr>OffsetToPadding);<br>
+ IO.mapRequired("<wbr>TotalFrameBytes", FrameProc.TotalFrameBytes);<br>
+ IO.mapRequired("<wbr>PaddingFrameBytes", FrameProc.PaddingFrameBytes);<br>
+ IO.mapRequired("<wbr>OffsetToPadding", FrameProc.OffsetToPadding);<br>
IO.mapRequired("<wbr>BytesOfCalleeSavedRegisters",<br>
- FrameProc.Header.<wbr>BytesOfCalleeSavedRegisters);<br>
+ FrameProc.<wbr>BytesOfCalleeSavedRegisters);<br>
IO.mapRequired("<wbr>OffsetOfExceptionHandler",<br>
- FrameProc.Header.<wbr>OffsetOfExceptionHandler);<br>
+ FrameProc.<wbr>OffsetOfExceptionHandler);<br>
IO.mapRequired("<wbr>SectionIdOfExceptionHandler",<br>
- FrameProc.Header.<wbr>SectionIdOfExceptionHandler);<br>
- IO.mapRequired("Flags", FrameProc.Header.Flags);<br>
+ FrameProc.<wbr>SectionIdOfExceptionHandler);<br>
+ IO.mapRequired("Flags", FrameProc.Flags);<br>
}<br>
<br>
void MappingTraits<CallSiteInfoSym><wbr>::mapping(IO &IO,<br>
CallSiteInfoSym &CallSiteInfo) {<br>
// TODO: Map Linkage Name<br>
- IO.mapRequired("Segment", CallSiteInfo.Header.Segment);<br>
- IO.mapRequired("Reserved", CallSiteInfo.Header.Reserved);<br>
- IO.mapRequired("Type", CallSiteInfo.Header.Type);<br>
+ IO.mapRequired("Segment", CallSiteInfo.Segment);<br>
+ IO.mapRequired("Type", CallSiteInfo.Type);<br>
}<br>
<br>
void MappingTraits<FileStaticSym>::<wbr>mapping(IO &IO, FileStaticSym &FileStatic) {<br>
- IO.mapRequired("Index", FileStatic.Header.Index);<br>
- IO.mapRequired("<wbr>ModFilenameOffset", FileStatic.Header.<wbr>ModFilenameOffset);<br>
- IO.mapRequired("Flags", FileStatic.Header.Flags);<br>
+ IO.mapRequired("Index", FileStatic.Index);<br>
+ IO.mapRequired("<wbr>ModFilenameOffset", FileStatic.ModFilenameOffset);<br>
+ IO.mapRequired("Flags", FileStatic.Flags);<br>
IO.mapRequired("Name", FileStatic.Name);<br>
}<br>
<br>
void MappingTraits<<wbr>HeapAllocationSiteSym>::<wbr>mapping(<br>
IO &IO, HeapAllocationSiteSym &HeapAllocSite) {<br>
// TODO: Map Linkage Name<br>
- IO.mapRequired("Segment", HeapAllocSite.Header.Segment);<br>
- IO.mapRequired("<wbr>CallInstructionSize",<br>
- HeapAllocSite.Header.<wbr>CallInstructionSize);<br>
- IO.mapRequired("Type", HeapAllocSite.Header.Type);<br>
+ IO.mapRequired("Segment", HeapAllocSite.Segment);<br>
+ IO.mapRequired("<wbr>CallInstructionSize", HeapAllocSite.<wbr>CallInstructionSize);<br>
+ IO.mapRequired("Type", HeapAllocSite.Type);<br>
}<br>
<br>
void MappingTraits<FrameCookieSym>:<wbr>:mapping(IO &IO,<br>
FrameCookieSym &FrameCookie) {<br>
// TODO: Map Linkage Name<br>
- IO.mapRequired("Register", FrameCookie.Header.Register);<br>
- IO.mapRequired("CookieKind", FrameCookie.Header.CookieKind)<wbr>;<br>
- IO.mapRequired("Flags", FrameCookie.Header.Flags);<br>
+ IO.mapRequired("Register", FrameCookie.Register);<br>
+ IO.mapRequired("CookieKind", FrameCookie.CookieKind);<br>
+ IO.mapRequired("Flags", FrameCookie.Flags);<br>
}<br>
<br>
void MappingTraits<CallerSym>::<wbr>mapping(IO &IO, CallerSym &Caller) {<br>
@@ -274,43 +364,43 @@ void MappingTraits<CallerSym>::<wbr>mapping(I<br>
}<br>
<br>
void MappingTraits<UDTSym>::<wbr>mapping(IO &IO, UDTSym &UDT) {<br>
- IO.mapRequired("Type", UDT.Header.Type);<br>
+ IO.mapRequired("Type", UDT.Type);<br>
IO.mapRequired("UDTName", UDT.Name);<br>
}<br>
<br>
void MappingTraits<BuildInfoSym>::<wbr>mapping(IO &IO, BuildInfoSym &BuildInfo) {<br>
- IO.mapRequired("BuildId", BuildInfo.Header.BuildId);<br>
+ IO.mapRequired("BuildId", BuildInfo.BuildId);<br>
}<br>
<br>
void MappingTraits<BPRelativeSym>::<wbr>mapping(IO &IO, BPRelativeSym &BPRel) {<br>
- IO.mapRequired("Offset", BPRel.Header.Offset);<br>
- IO.mapRequired("Type", BPRel.Header.Type);<br>
+ IO.mapRequired("Offset", BPRel.Offset);<br>
+ IO.mapRequired("Type", BPRel.Type);<br>
IO.mapRequired("VarName", BPRel.Name);<br>
}<br>
<br>
void MappingTraits<RegRelativeSym>:<wbr>:mapping(IO &IO, RegRelativeSym &RegRel) {<br>
- IO.mapRequired("Offset", RegRel.Header.Offset);<br>
- IO.mapRequired("Type", RegRel.Header.Type);<br>
- IO.mapRequired("Register", RegRel.Header.Register);<br>
+ IO.mapRequired("Offset", RegRel.Offset);<br>
+ IO.mapRequired("Type", RegRel.Type);<br>
+ IO.mapRequired("Register", RegRel.Register);<br>
IO.mapRequired("VarName", RegRel.Name);<br>
}<br>
<br>
void MappingTraits<ConstantSym>::<wbr>mapping(IO &IO, ConstantSym &Constant) {<br>
- IO.mapRequired("Type", Constant.Header.Type);<br>
+ IO.mapRequired("Type", Constant.Type);<br>
IO.mapRequired("Value", Constant.Value);<br>
IO.mapRequired("Name", Constant.Name);<br>
}<br>
<br>
void MappingTraits<DataSym>::<wbr>mapping(IO &IO, DataSym &Data) {<br>
// TODO: Map linkage name<br>
- IO.mapRequired("Type", Data.Header.Type);<br>
+ IO.mapRequired("Type", Data.Type);<br>
IO.mapRequired("DisplayName", Data.Name);<br>
}<br>
<br>
void MappingTraits<<wbr>ThreadLocalDataSym>::mapping(<wbr>IO &IO,<br>
ThreadLocalDataSym &Data) {<br>
// TODO: Map linkage name<br>
- IO.mapRequired("Type", Data.Header.Type);<br>
+ IO.mapRequired("Type", Data.Type);<br>
IO.mapRequired("DisplayName", Data.Name);<br>
}<br>
}<br>
<br>
<br>
______________________________<wbr>_________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>