Author: gclayton Date: Wed May 8 15:03:22 2019 New Revision: 360292 URL: http://llvm.org/viewvc/llvm-project?rev=360292&view=rev Log: Fix bug in ArchSpec::MergeFrom
Previous ArchSpec tests didn't catch this bug since we never tested just the OS being out of date. Fixed the bug and covered this with a test that would catch this. This was found when trying to load a core file where the core file was an ELF file with just the e_machine for architeture and where the ELF header had no OS set in the OSABI field of the e_ident. It wasn't merging the architecture with the target architecture correctly. Differential Revision: https://reviews.llvm.org/D61659 Modified: lldb/trunk/source/Utility/ArchSpec.cpp lldb/trunk/unittests/Utility/ArchSpecTest.cpp Modified: lldb/trunk/source/Utility/ArchSpec.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Utility/ArchSpec.cpp?rev=360292&r1=360291&r2=360292&view=diff ============================================================================== --- lldb/trunk/source/Utility/ArchSpec.cpp (original) +++ lldb/trunk/source/Utility/ArchSpec.cpp Wed May 8 15:03:22 2019 @@ -859,7 +859,7 @@ bool ArchSpec::ContainsOnlyArch(const ll void ArchSpec::MergeFrom(const ArchSpec &other) { if (!TripleVendorWasSpecified() && other.TripleVendorWasSpecified()) GetTriple().setVendor(other.GetTriple().getVendor()); - if (!TripleOSWasSpecified() && other.TripleVendorWasSpecified()) + if (!TripleOSWasSpecified() && other.TripleOSWasSpecified()) GetTriple().setOS(other.GetTriple().getOS()); if (GetTriple().getArch() == llvm::Triple::UnknownArch) { GetTriple().setArch(other.GetTriple().getArch()); Modified: lldb/trunk/unittests/Utility/ArchSpecTest.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/Utility/ArchSpecTest.cpp?rev=360292&r1=360291&r2=360292&view=diff ============================================================================== --- lldb/trunk/unittests/Utility/ArchSpecTest.cpp (original) +++ lldb/trunk/unittests/Utility/ArchSpecTest.cpp Wed May 8 15:03:22 2019 @@ -10,6 +10,7 @@ #include "lldb/Utility/ArchSpec.h" #include "llvm/BinaryFormat/MachO.h" +#include "llvm/BinaryFormat/ELF.h" using namespace lldb; using namespace lldb_private; @@ -174,6 +175,31 @@ TEST(ArchSpecTest, MergeFrom) { EXPECT_EQ(llvm::Triple::EnvironmentType::Android, A.GetTriple().getEnvironment()); } + { + ArchSpec A, B; + A.SetArchitecture(eArchTypeELF, llvm::ELF::EM_ARM, + LLDB_INVALID_CPUTYPE, llvm::ELF::ELFOSABI_NONE); + B.SetArchitecture(eArchTypeELF, llvm::ELF::EM_ARM, + LLDB_INVALID_CPUTYPE, llvm::ELF::ELFOSABI_LINUX); + + EXPECT_TRUE(A.IsValid()); + EXPECT_TRUE(B.IsValid()); + + EXPECT_EQ(llvm::Triple::ArchType::arm, B.GetTriple().getArch()); + EXPECT_EQ(llvm::Triple::VendorType::UnknownVendor, + B.GetTriple().getVendor()); + EXPECT_EQ(llvm::Triple::OSType::Linux, B.GetTriple().getOS()); + EXPECT_EQ(llvm::Triple::EnvironmentType::UnknownEnvironment, + B.GetTriple().getEnvironment()); + + A.MergeFrom(B); + EXPECT_EQ(llvm::Triple::ArchType::arm, A.GetTriple().getArch()); + EXPECT_EQ(llvm::Triple::VendorType::UnknownVendor, + A.GetTriple().getVendor()); + EXPECT_EQ(llvm::Triple::OSType::Linux, A.GetTriple().getOS()); + EXPECT_EQ(llvm::Triple::EnvironmentType::UnknownEnvironment, + A.GetTriple().getEnvironment()); + } } TEST(ArchSpecTest, MergeFromMachOUnknown) { _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
