Fix struct member names and simplify. NFC.

llvm-svn: 270289
This commit is contained in:
Rui Ueyama 2016-05-20 22:59:05 +00:00
parent 1c6d827015
commit 2a58779198
1 changed files with 4 additions and 6 deletions

View File

@ -35,7 +35,7 @@ struct DataSym32 {
ulittle32_t TypIndex; // Type index, or Metadata token if a managed symbol
ulittle32_t off;
ulittle16_t seg;
char name[1];
char Name[1];
};
// For S_PROCREF symbol type.
@ -43,7 +43,7 @@ struct RefSym {
ulittle32_t SumName; // SUC of the name (?)
ulittle32_t SymOffset; // Offset of actual symbol in $$Symbols
ulittle16_t Mod; // Module containing the actual symbol
char name[1];
char Name[1];
};
}
@ -54,8 +54,6 @@ SymbolStream::~SymbolStream() {}
Error SymbolStream::reload() { return Error::success(); }
static StringRef makeStringRef(char *p) { return {p, strlen(p)}; }
Expected<std::string> SymbolStream::getSymbolName(uint32_t Off) const {
StreamReader Reader(Stream);
Reader.setOffset(Off);
@ -74,9 +72,9 @@ Expected<std::string> SymbolStream::getSymbolName(uint32_t Off) const {
switch (Hdr.Type) {
case codeview::S_PUB32:
return makeStringRef(reinterpret_cast<DataSym32 *>(Buf.data())->name);
return reinterpret_cast<DataSym32 *>(Buf.data())->Name;
case codeview::S_PROCREF:
return makeStringRef(reinterpret_cast<RefSym *>(Buf.data())->name);
return reinterpret_cast<RefSym *>(Buf.data())->Name;
default:
return make_error<RawError>(raw_error_code::corrupt_file,
"Unknown symbol type");