[llvm] 5d11e7f - Revert "Fix GSYM tests to run the yaml files and fix test failures on some machines."

[Greg Clayton via llvm-commits]

Author: Greg Clayton
Date: 2020-02-28T21:19:05-08:00
New Revision: 5d11e7f81cb60abc94deb0c4e41c48f39ea1da1c

URL: https://github.com/llvm/llvm-project/commit/5d11e7f81cb60abc94deb0c4e41c48f39ea1da1c
DIFF: https://github.com/llvm/llvm-project/commit/5d11e7f81cb60abc94deb0c4e41c48f39ea1da1c.diff

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

This reverts commit d334ce0b5acb945d6202d0ab6a17bdca530f50c1.

Added: 
    

Modified: 
    llvm/tools/llvm-gsym/llvm-gsymutil.cpp

Removed: 
    llvm/test/tools/llvm-gsymutil/lit.local.cfg


################################################################################
diff  --git a/llvm/test/tools/llvm-gsymutil/lit.local.cfg b/llvm/test/tools/llvm-gsymutil/lit.local.cfg
deleted file mode 100644
index db82cc231003..000000000000
--- a/llvm/test/tools/llvm-gsymutil/lit.local.cfg
+++ /dev/null
@@ -1 +0,0 @@
-config.suffixes = ['.test', '.yaml']

diff  --git a/llvm/tools/llvm-gsym/llvm-gsymutil.cpp b/llvm/tools/llvm-gsym/llvm-gsymutil.cpp
index a3be9e3149db..c7d6cf33da67 100644
--- a/llvm/tools/llvm-gsym/llvm-gsymutil.cpp
+++ b/llvm/tools/llvm-gsym/llvm-gsymutil.cpp
@@ -179,8 +179,7 @@ static bool filterArch(MachOObjectFile &Obj) {
   if (ArchFilters.empty())
     return true;
 
-  Triple ObjTriple(Obj.getArchTriple());
-  StringRef ObjArch = ObjTriple.getArchName();
+  StringRef ObjArch = Obj.getArchTriple().getArchName();
 
   for (auto Arch : ArchFilters) {
     // Match name.
@@ -351,8 +350,7 @@ static llvm::Error handleBuffer(StringRef Filename, MemoryBufferRef Buffer,
   error(Filename, errorToErrorCode(BinOrErr.takeError()));
 
   if (auto *Obj = dyn_cast<ObjectFile>(BinOrErr->get())) {
-    Triple ObjTriple(Obj->makeTriple());
-    auto ArchName = ObjTriple.getArchName();
+    auto ArchName = Obj->makeTriple().getArchName();
     outs() << "Output file (" << ArchName << "): " << OutFile << "\n";
     if (auto Err = handleObjectFile(*Obj, OutFile.c_str()))
       return Err;
@@ -376,8 +374,7 @@ static llvm::Error handleBuffer(StringRef Filename, MemoryBufferRef Buffer,
 
     // Now handle each architecture we need to convert.
     for (auto &Obj: FilterObjs) {
-      Triple ObjTriple(Obj->getArchTriple());
-      auto ArchName = ObjTriple.getArchName();
+      auto ArchName = Obj->getArchTriple().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