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

This reverts commit 8d41f1a023.

This change broke the MSan buildbots - see comments in
https://reviews.llvm.org/D75390 for more information.
This commit is contained in:
Mitch Phillips 2020-03-04 10:04:11 -08:00
parent fe61bc1a0b
commit 58079aa91b
7 changed files with 4 additions and 21 deletions

View File

@ -29,13 +29,7 @@ uint32_t GsymCreator::insertFile(StringRef Path,
llvm::sys::path::Style Style) { llvm::sys::path::Style Style) {
llvm::StringRef directory = llvm::sys::path::parent_path(Path, Style); llvm::StringRef directory = llvm::sys::path::parent_path(Path, Style);
llvm::StringRef filename = llvm::sys::path::filename(Path, Style); llvm::StringRef filename = llvm::sys::path::filename(Path, Style);
// We must insert the strings first, then call the FileEntry constructor. FileEntry FE(insertString(directory), insertString(filename));
// 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<std::recursive_mutex> Guard(Mutex); std::lock_guard<std::recursive_mutex> Guard(Mutex);
const auto NextIndex = Files.size(); const auto NextIndex = Files.size();

View File

@ -1,4 +0,0 @@
if not ('ARM' in config.root.targets and 'AArch64' in config.root.targets):
config.unsupported = True
config.suffixes = ['.test', '.yaml']

View File

@ -1,4 +0,0 @@
if not 'X86' in config.root.targets:
config.unsupported = True
config.suffixes = ['.test', '.yaml']

View File

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