mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-11-24 11:42:57 +01:00
f067530e7a
llvm-dsymutil was misinterpreting the value of common symbols as their address when it actually contains their size. This didn't impact llvm-dsymutil's ability to link the debug information for common symbols because these are always found by name and not by address. Things could however go wrong when the size of a common object matched the object file address of another symbol. Depending on the link order of the symbols the common object might incorrectly evict this other object from the address to symbol mapping, and then link the evicted symbol with a wrong binary address. Use the new ability to have symbols without an object file address to fix this. llvm-svn: 259318
256 lines
8.4 KiB
C++
256 lines
8.4 KiB
C++
//===- tools/dsymutil/DebugMap.cpp - Generic debug map representation -----===//
|
|
//
|
|
// The LLVM Linker
|
|
//
|
|
// This file is distributed under the University of Illinois Open Source
|
|
// License. See LICENSE.TXT for details.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
#include "DebugMap.h"
|
|
#include "BinaryHolder.h"
|
|
#include "llvm/ADT/STLExtras.h"
|
|
#include "llvm/ADT/iterator_range.h"
|
|
#include "llvm/Support/DataTypes.h"
|
|
#include "llvm/Support/Format.h"
|
|
#include "llvm/Support/raw_ostream.h"
|
|
#include <algorithm>
|
|
|
|
namespace llvm {
|
|
namespace dsymutil {
|
|
|
|
using namespace llvm::object;
|
|
|
|
DebugMapObject::DebugMapObject(StringRef ObjectFilename,
|
|
sys::TimeValue Timestamp)
|
|
: Filename(ObjectFilename), Timestamp(Timestamp) {}
|
|
|
|
bool DebugMapObject::addSymbol(StringRef Name, Optional<uint64_t> ObjectAddress,
|
|
uint64_t LinkedAddress, uint32_t Size) {
|
|
auto InsertResult = Symbols.insert(
|
|
std::make_pair(Name, SymbolMapping(ObjectAddress, LinkedAddress, Size)));
|
|
|
|
if (ObjectAddress && InsertResult.second)
|
|
AddressToMapping[*ObjectAddress] = &*InsertResult.first;
|
|
return InsertResult.second;
|
|
}
|
|
|
|
void DebugMapObject::print(raw_ostream &OS) const {
|
|
OS << getObjectFilename() << ":\n";
|
|
// Sort the symbols in alphabetical order, like llvm-nm (and to get
|
|
// deterministic output for testing).
|
|
typedef std::pair<StringRef, SymbolMapping> Entry;
|
|
std::vector<Entry> Entries;
|
|
Entries.reserve(Symbols.getNumItems());
|
|
for (const auto &Sym : make_range(Symbols.begin(), Symbols.end()))
|
|
Entries.push_back(std::make_pair(Sym.getKey(), Sym.getValue()));
|
|
std::sort(
|
|
Entries.begin(), Entries.end(),
|
|
[](const Entry &LHS, const Entry &RHS) { return LHS.first < RHS.first; });
|
|
for (const auto &Sym : Entries) {
|
|
if (Sym.second.ObjectAddress)
|
|
OS << format("\t%016" PRIx64, uint64_t(*Sym.second.ObjectAddress));
|
|
else
|
|
OS << "\t????????????????";
|
|
OS << format(" => %016" PRIx64 "+0x%x\t%s\n",
|
|
uint64_t(Sym.second.BinaryAddress), uint32_t(Sym.second.Size),
|
|
Sym.first.data());
|
|
}
|
|
OS << '\n';
|
|
}
|
|
|
|
#ifndef NDEBUG
|
|
void DebugMapObject::dump() const { print(errs()); }
|
|
#endif
|
|
|
|
DebugMapObject &DebugMap::addDebugMapObject(StringRef ObjectFilePath,
|
|
sys::TimeValue Timestamp) {
|
|
Objects.emplace_back(new DebugMapObject(ObjectFilePath, Timestamp));
|
|
return *Objects.back();
|
|
}
|
|
|
|
const DebugMapObject::DebugMapEntry *
|
|
DebugMapObject::lookupSymbol(StringRef SymbolName) const {
|
|
StringMap<SymbolMapping>::const_iterator Sym = Symbols.find(SymbolName);
|
|
if (Sym == Symbols.end())
|
|
return nullptr;
|
|
return &*Sym;
|
|
}
|
|
|
|
const DebugMapObject::DebugMapEntry *
|
|
DebugMapObject::lookupObjectAddress(uint64_t Address) const {
|
|
auto Mapping = AddressToMapping.find(Address);
|
|
if (Mapping == AddressToMapping.end())
|
|
return nullptr;
|
|
return Mapping->getSecond();
|
|
}
|
|
|
|
void DebugMap::print(raw_ostream &OS) const {
|
|
yaml::Output yout(OS, /* Ctxt = */ nullptr, /* WrapColumn = */ 0);
|
|
yout << const_cast<DebugMap &>(*this);
|
|
}
|
|
|
|
#ifndef NDEBUG
|
|
void DebugMap::dump() const { print(errs()); }
|
|
#endif
|
|
|
|
namespace {
|
|
struct YAMLContext {
|
|
StringRef PrependPath;
|
|
Triple BinaryTriple;
|
|
};
|
|
}
|
|
|
|
ErrorOr<std::vector<std::unique_ptr<DebugMap>>>
|
|
DebugMap::parseYAMLDebugMap(StringRef InputFile, StringRef PrependPath,
|
|
bool Verbose) {
|
|
auto ErrOrFile = MemoryBuffer::getFileOrSTDIN(InputFile);
|
|
if (auto Err = ErrOrFile.getError())
|
|
return Err;
|
|
|
|
YAMLContext Ctxt;
|
|
|
|
Ctxt.PrependPath = PrependPath;
|
|
|
|
std::unique_ptr<DebugMap> Res;
|
|
yaml::Input yin((*ErrOrFile)->getBuffer(), &Ctxt);
|
|
yin >> Res;
|
|
|
|
if (auto EC = yin.error())
|
|
return EC;
|
|
std::vector<std::unique_ptr<DebugMap>> Result;
|
|
Result.push_back(std::move(Res));
|
|
return std::move(Result);
|
|
}
|
|
}
|
|
|
|
namespace yaml {
|
|
|
|
// Normalize/Denormalize between YAML and a DebugMapObject.
|
|
struct MappingTraits<dsymutil::DebugMapObject>::YamlDMO {
|
|
YamlDMO(IO &io) { Timestamp = 0; }
|
|
YamlDMO(IO &io, dsymutil::DebugMapObject &Obj);
|
|
dsymutil::DebugMapObject denormalize(IO &IO);
|
|
|
|
std::string Filename;
|
|
sys::TimeValue::SecondsType Timestamp;
|
|
std::vector<dsymutil::DebugMapObject::YAMLSymbolMapping> Entries;
|
|
};
|
|
|
|
void MappingTraits<std::pair<std::string, DebugMapObject::SymbolMapping>>::
|
|
mapping(IO &io, std::pair<std::string, DebugMapObject::SymbolMapping> &s) {
|
|
io.mapRequired("sym", s.first);
|
|
io.mapOptional("objAddr", s.second.ObjectAddress);
|
|
io.mapRequired("binAddr", s.second.BinaryAddress);
|
|
io.mapOptional("size", s.second.Size);
|
|
}
|
|
|
|
void MappingTraits<dsymutil::DebugMapObject>::mapping(
|
|
IO &io, dsymutil::DebugMapObject &DMO) {
|
|
MappingNormalization<YamlDMO, dsymutil::DebugMapObject> Norm(io, DMO);
|
|
io.mapRequired("filename", Norm->Filename);
|
|
io.mapOptional("timestamp", Norm->Timestamp);
|
|
io.mapRequired("symbols", Norm->Entries);
|
|
}
|
|
|
|
void ScalarTraits<Triple>::output(const Triple &val, void *,
|
|
llvm::raw_ostream &out) {
|
|
out << val.str();
|
|
}
|
|
|
|
StringRef ScalarTraits<Triple>::input(StringRef scalar, void *, Triple &value) {
|
|
value = Triple(scalar);
|
|
return StringRef();
|
|
}
|
|
|
|
size_t
|
|
SequenceTraits<std::vector<std::unique_ptr<dsymutil::DebugMapObject>>>::size(
|
|
IO &io, std::vector<std::unique_ptr<dsymutil::DebugMapObject>> &seq) {
|
|
return seq.size();
|
|
}
|
|
|
|
dsymutil::DebugMapObject &
|
|
SequenceTraits<std::vector<std::unique_ptr<dsymutil::DebugMapObject>>>::element(
|
|
IO &, std::vector<std::unique_ptr<dsymutil::DebugMapObject>> &seq,
|
|
size_t index) {
|
|
if (index >= seq.size()) {
|
|
seq.resize(index + 1);
|
|
seq[index].reset(new dsymutil::DebugMapObject);
|
|
}
|
|
return *seq[index];
|
|
}
|
|
|
|
void MappingTraits<dsymutil::DebugMap>::mapping(IO &io,
|
|
dsymutil::DebugMap &DM) {
|
|
io.mapRequired("triple", DM.BinaryTriple);
|
|
io.mapOptional("binary-path", DM.BinaryPath);
|
|
if (void *Ctxt = io.getContext())
|
|
reinterpret_cast<YAMLContext *>(Ctxt)->BinaryTriple = DM.BinaryTriple;
|
|
io.mapOptional("objects", DM.Objects);
|
|
}
|
|
|
|
void MappingTraits<std::unique_ptr<dsymutil::DebugMap>>::mapping(
|
|
IO &io, std::unique_ptr<dsymutil::DebugMap> &DM) {
|
|
if (!DM)
|
|
DM.reset(new DebugMap());
|
|
io.mapRequired("triple", DM->BinaryTriple);
|
|
io.mapOptional("binary-path", DM->BinaryPath);
|
|
if (void *Ctxt = io.getContext())
|
|
reinterpret_cast<YAMLContext *>(Ctxt)->BinaryTriple = DM->BinaryTriple;
|
|
io.mapOptional("objects", DM->Objects);
|
|
}
|
|
|
|
MappingTraits<dsymutil::DebugMapObject>::YamlDMO::YamlDMO(
|
|
IO &io, dsymutil::DebugMapObject &Obj) {
|
|
Filename = Obj.Filename;
|
|
Timestamp = Obj.getTimestamp().toEpochTime();
|
|
Entries.reserve(Obj.Symbols.size());
|
|
for (auto &Entry : Obj.Symbols)
|
|
Entries.push_back(std::make_pair(Entry.getKey(), Entry.getValue()));
|
|
}
|
|
|
|
dsymutil::DebugMapObject
|
|
MappingTraits<dsymutil::DebugMapObject>::YamlDMO::denormalize(IO &IO) {
|
|
BinaryHolder BinHolder(/* Verbose =*/false);
|
|
const auto &Ctxt = *reinterpret_cast<YAMLContext *>(IO.getContext());
|
|
SmallString<80> Path(Ctxt.PrependPath);
|
|
StringMap<uint64_t> SymbolAddresses;
|
|
|
|
sys::path::append(Path, Filename);
|
|
auto ErrOrObjectFiles = BinHolder.GetObjectFiles(Path);
|
|
if (auto EC = ErrOrObjectFiles.getError()) {
|
|
llvm::errs() << "warning: Unable to open " << Path << " " << EC.message()
|
|
<< '\n';
|
|
} else if (auto ErrOrObjectFile = BinHolder.Get(Ctxt.BinaryTriple)) {
|
|
// Rewrite the object file symbol addresses in the debug map. The
|
|
// YAML input is mainly used to test llvm-dsymutil without
|
|
// requiring binaries checked-in. If we generate the object files
|
|
// during the test, we can't hardcode the symbols addresses, so
|
|
// look them up here and rewrite them.
|
|
for (const auto &Sym : ErrOrObjectFile->symbols()) {
|
|
uint64_t Address = Sym.getValue();
|
|
ErrorOr<StringRef> Name = Sym.getName();
|
|
if (!Name ||
|
|
(Sym.getFlags() & (SymbolRef::SF_Absolute | SymbolRef::SF_Common)))
|
|
continue;
|
|
SymbolAddresses[*Name] = Address;
|
|
}
|
|
}
|
|
|
|
sys::TimeValue TV;
|
|
TV.fromEpochTime(Timestamp);
|
|
dsymutil::DebugMapObject Res(Path, TV);
|
|
for (auto &Entry : Entries) {
|
|
auto &Mapping = Entry.second;
|
|
Optional<uint64_t> ObjAddress;
|
|
if (Mapping.ObjectAddress)
|
|
ObjAddress = *Mapping.ObjectAddress;
|
|
auto AddressIt = SymbolAddresses.find(Entry.first);
|
|
if (AddressIt != SymbolAddresses.end())
|
|
ObjAddress = AddressIt->getValue();
|
|
Res.addSymbol(Entry.first, ObjAddress, Mapping.BinaryAddress, Mapping.Size);
|
|
}
|
|
return Res;
|
|
}
|
|
}
|
|
}
|