Use objfile_sp->GetArchitecture().GetTriple().isAppleMachO() instead

Author: royitaqi

lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp

@@ -38,7 +38,6 @@
 #include "lldb/Target/StackFrame.h"
 
 #include "LogChannelDWARF.h"
-#include "Plugins/ObjectFile/Mach-O/ObjectFileMachO.h"
 #include "SymbolFileDWARF.h"
 #include "lldb/lldb-private-enumerations.h"
 
@@ -247,7 +246,8 @@ llvm::StringRef SymbolFileDWARFDebugMap::GetPluginDescriptionStatic() {
 }
 
 SymbolFile *SymbolFileDWARFDebugMap::CreateInstance(ObjectFileSP objfile_sp) {
-  if (objfile_sp->GetPluginName() != ObjectFileMachO::GetPluginNameStatic())
+  // Don't create a debug map if the object file isn't a Mach-O.
+  if (!objfile_sp->GetArchitecture().GetTriple().isAppleMachO())
     return nullptr;
   return new SymbolFileDWARFDebugMap(std::move(objfile_sp));
 }

lldb/unittests/SymbolFile/DWARF/SymbolFileDWARFDebugMapTests.cpp

@@ -25,6 +25,7 @@ class SymbolFileDWARFDebugMapTests : public testing::Test {
   SubsystemRAII<ObjectFileELF, ObjectFileMachO> subsystems;
 };
 
+#ifdef __APPLE__
 TEST_F(SymbolFileDWARFDebugMapTests, CreateInstanceReturnNonNullForMachOFile) {
   // Make sure we don't crash parsing a null unit DIE.
   const char *yamldata = R"(
@@ -77,7 +78,9 @@ TEST_F(SymbolFileDWARFDebugMapTests, CreateInstanceReturnNonNullForMachOFile) {
       SymbolFileDWARFDebugMap::CreateInstance(object_file->shared_from_this());
   ASSERT_NE(debug_map, nullptr);
 }
+#endif
 
+#ifdef __linux__
 TEST_F(SymbolFileDWARFDebugMapTests, CreateInstanceReturnNullForNonMachOFile) {
   // Make sure we don't crash parsing a null unit DIE.
   const char *yamldata = R"(
@@ -140,3 +143,4 @@ TEST_F(SymbolFileDWARFDebugMapTests, CreateInstanceReturnNullForNonMachOFile) {
       SymbolFileDWARFDebugMap::CreateInstance(object_file->shared_from_this());
   ASSERT_EQ(debug_map, nullptr);
 }
+#endif