RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-22 18:54:02 +01:00
Code Issues Projects Releases Wiki Activity

Fix GSYM tests to run the yaml files and fix test failures on some machines.

Browse Source 
Summary: YAML files were not being run during lit testing as there was no lit.local.cfg file. Once this was fixed, some buildbots would fail due to a StringRef that pointed to a std::string inside of a temporary llvm::Triple object. These issues are fixed here by making a local triple object that stays around long enough so the StringRef points to valid data.

Reviewers: aprantl, thakis, MaskRay, aadsm, wallace

Subscribers: llvm-commits

Tags: #llvm

Differential Revision: https://reviews.llvm.org/D75390
This commit is contained in:
Greg Clayton 2020-02-28 15:25:47 -08:00
parent 59cbe304e3
commit b3b557685a
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/tools/llvm-gsymutil/lit.local.cfg Normal file
View File

@ -0,0 +1 @@
config.suffixes = ['.test', '.yaml']

9
tools/llvm-gsym/llvm-gsymutil.cpp
View File

@ -179,7 +179,8 @@ static bool filterArch(MachOObjectFile &Obj) {
if (ArchFilters.empty())
return true;
StringRef ObjArch = Obj.getArchTriple().getArchName();
Triple ObjTriple(Obj.getArchTriple());
StringRef ObjArch = ObjTriple.getArchName();
for (auto Arch : ArchFilters) {
// Match name.
@ -350,7 +351,8 @@ static llvm::Error handleBuffer(StringRef Filename, MemoryBufferRef Buffer,
error(Filename, errorToErrorCode(BinOrErr.takeError()));
if (auto *Obj = dyn_cast<ObjectFile>(BinOrErr->get())) {
auto ArchName = Obj->makeTriple().getArchName();
Triple ObjTriple(Obj->makeTriple());
auto ArchName = ObjTriple.getArchName();
outs() << "Output file (" << ArchName << "): " << OutFile << "\n";
if (auto Err = handleObjectFile(*Obj, OutFile.c_str()))
return Err;
@ -374,7 +376,8 @@ static llvm::Error handleBuffer(StringRef Filename, MemoryBufferRef Buffer,
// Now handle each architecture we need to convert.
for (auto &Obj: FilterObjs) {
auto ArchName = Obj->getArchTriple().getArchName();
Triple ObjTriple(Obj->getArchTriple());
auto ArchName = ObjTriple.getArchName();
std::string ArchOutFile(OutFile);
// If we are only handling a single architecture, then we will use the
// normal output file. If we are handling multiple architectures append