From 57688350adea307e7bccb83b68a5b7333de31fd7 Mon Sep 17 00:00:00 2001 From: Greg Clayton Date: Mon, 2 Mar 2020 12:40:46 -0800 Subject: [PATCH] Fix GSYM tests to run the yaml files and fix test failures on some machines. 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. Also fixed an issue where strings for files in the file table could be added in opposite order due to parameters to function calls not having a strong ordering, which caused tests to fail. Differential Revision: https://reviews.llvm.org/D75390 --- llvm/lib/DebugInfo/GSYM/GsymCreator.cpp | 8 +++++++- llvm/test/tools/llvm-gsymutil/lit.local.cfg | 1 + llvm/tools/llvm-gsym/llvm-gsymutil.cpp | 9 ++++++--- 3 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 llvm/test/tools/llvm-gsymutil/lit.local.cfg diff --git a/llvm/lib/DebugInfo/GSYM/GsymCreator.cpp b/llvm/lib/DebugInfo/GSYM/GsymCreator.cpp index 3a84ac4..091f1af 100644 --- a/llvm/lib/DebugInfo/GSYM/GsymCreator.cpp +++ b/llvm/lib/DebugInfo/GSYM/GsymCreator.cpp @@ -29,7 +29,13 @@ uint32_t GsymCreator::insertFile(StringRef Path, llvm::sys::path::Style Style) { llvm::StringRef directory = llvm::sys::path::parent_path(Path, Style); llvm::StringRef filename = llvm::sys::path::filename(Path, Style); - FileEntry FE(insertString(directory), insertString(filename)); + // We must insert the strings first, then call the FileEntry constructor. + // If we inline the insertString() function call into the constructor, the + // call order is undefined due to parameter lists not having any ordering + // requirements. + const uint32_t Dir = insertString(directory); + const uint32_t Base = insertString(filename); + FileEntry FE(Dir, Base); std::lock_guard Guard(Mutex); const auto NextIndex = Files.size(); diff --git a/llvm/test/tools/llvm-gsymutil/lit.local.cfg b/llvm/test/tools/llvm-gsymutil/lit.local.cfg new file mode 100644 index 0000000..db82cc2 --- /dev/null +++ b/llvm/test/tools/llvm-gsymutil/lit.local.cfg @@ -0,0 +1 @@ +config.suffixes = ['.test', '.yaml'] diff --git a/llvm/tools/llvm-gsym/llvm-gsymutil.cpp b/llvm/tools/llvm-gsym/llvm-gsymutil.cpp index c7d6cf3..a3be9e3 100644 --- a/llvm/tools/llvm-gsym/llvm-gsymutil.cpp +++ b/llvm/tools/llvm-gsym/llvm-gsymutil.cpp @@ -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(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 -- 2.7.4