Index: lib/DebugInfo/Symbolize/Symbolize.cpp =================================================================== --- lib/DebugInfo/Symbolize/Symbolize.cpp +++ lib/DebugInfo/Symbolize/Symbolize.cpp @@ -355,8 +355,17 @@ auto ObjectsOrErr = getOrCreateObjects(BinaryName, ArchName); if (auto EC = ObjectsOrErr.getError()) { // Failed to find valid object file. - Modules.insert(std::make_pair(ModuleName, EC)); - return EC; + // For x86_64h, fallback to x86_64. + if (ArchName == "x86_64h") { + ObjectsOrErr = getOrCreateObjects(BinaryName, "x86_64"); + if (auto EC = ObjectsOrErr.getError()) { + Modules.insert(std::make_pair(ModuleName, EC)); + return EC; + } + } else { + Modules.insert(std::make_pair(ModuleName, EC)); + return EC; + } } ObjectPair Objects = ObjectsOrErr.get();