Merge pull request #7651 from bulbazord/20230725-remove-swift-section-changes

[lldb][NFCI] Remove Section::CanContainSwiftReflectionData

Author: bulbazord

lldb/include/lldb/Core/Section.h

@@ -209,8 +209,6 @@ class Section : public std::enable_shared_from_this<Section>,
   ObjectFile *GetObjectFile() { return m_obj_file; }
   const ObjectFile *GetObjectFile() const { return m_obj_file; }
 
-  bool CanContainSwiftReflectionData() const;
-
   /// Read the section data from the object file that the section
   /// resides in.
   ///

lldb/include/lldb/Symbol/ObjectFile.h

@@ -25,7 +25,6 @@
 #include <optional>
 
 namespace swift {
-class SwiftObjectFileFormat;
 enum ReflectionSectionKind : uint8_t;
 }
 namespace lldb_private {
@@ -725,12 +724,6 @@ class ObjectFile : public std::enable_shared_from_this<ObjectFile>,
   virtual llvm::StringRef
   GetReflectionSectionIdentifier(swift::ReflectionSectionKind section);
 
-#ifdef LLDB_ENABLE_SWIFT
-  virtual bool CanContainSwiftReflectionData(const Section &section) {
-    return false;
-  }
-#endif // LLDB_ENABLE_SWIFT
-
   /// Load binaries listed in a corefile
   ///
   /// A corefile may have metadata listing binaries that can be loaded,

lldb/source/Core/Section.cpp

@@ -378,14 +378,6 @@ void Section::SetPermissions(uint32_t permissions) {
   m_executable = (permissions & ePermissionsExecutable) != 0;
 }
 
-bool Section::CanContainSwiftReflectionData() const {
-#ifdef LLDB_ENABLE_SWIFT
-  return m_obj_file->CanContainSwiftReflectionData(*this);
-#else
-  return false;
-#endif // LLDB_ENABLE_SWIFT
-}
-
 lldb::offset_t Section::GetSectionData(void *dst, lldb::offset_t dst_len,
                                        lldb::offset_t offset) {
   if (m_obj_file)

lldb/source/Plugins/LanguageRuntime/Swift/LLDBMemoryReader.cpp

@@ -146,6 +146,27 @@ LLDBMemoryReader::getSymbolAddress(const std::string &name) {
   return swift::remote::RemoteAddress(load_addr);
 }
 
+static std::unique_ptr<swift::SwiftObjectFileFormat>
+GetSwiftObjectFileFormat(llvm::Triple::ObjectFormatType obj_format_type) {
+  std::unique_ptr<swift::SwiftObjectFileFormat> obj_file_format;
+  switch (obj_format_type) {
+  case llvm::Triple::MachO:
+    obj_file_format = std::make_unique<swift::SwiftObjectFileFormatMachO>();
+    break;
+  case llvm::Triple::ELF:
+    obj_file_format = std::make_unique<swift::SwiftObjectFileFormatELF>();
+    break;
+  case llvm::Triple::COFF:
+    obj_file_format = std::make_unique<swift::SwiftObjectFileFormatCOFF>();
+    break;
+  default:
+    LLDB_LOG(GetLog(LLDBLog::Types), "Could not determine swift reflection "
+                                     "section names for object format type");
+    break;
+  }
+  return obj_file_format;
+}
+
 llvm::Optional<swift::remote::RemoteAbsolutePointer>
 LLDBMemoryReader::resolvePointerAsSymbol(swift::remote::RemoteAddress address) {
   // If an address has a symbol, that symbol provides additional useful data to
@@ -173,8 +194,18 @@ LLDBMemoryReader::resolvePointerAsSymbol(swift::remote::RemoteAddress address) {
       return {};
   }
 
-  if (!addr.GetSection()->CanContainSwiftReflectionData())
-    return {};
+  if (auto section_sp = addr.GetSection()) {
+    if (auto *obj_file = section_sp->GetObjectFile()) {
+      auto obj_file_format_type =
+          obj_file->GetArchitecture().GetTriple().getObjectFormat();
+      if (auto swift_obj_file_format =
+              GetSwiftObjectFileFormat(obj_file_format_type)) {
+        if (!swift_obj_file_format->sectionContainsReflectionData(
+                section_sp->GetName().GetStringRef()))
+          return {};
+      }
+    }
+  }
 
   if (auto *symbol = addr.CalculateSymbolContextSymbol()) {
     auto mangledName = symbol->GetMangled().GetMangledName().GetStringRef();

lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp

@@ -3598,11 +3598,3 @@ llvm::StringRef ObjectFileELF::GetReflectionSectionIdentifier(
   llvm_unreachable("Swift support disabled");
 #endif //LLDB_ENABLE_SWIFT
 }
-
-#ifdef LLDB_ENABLE_SWIFT
-bool ObjectFileELF::CanContainSwiftReflectionData(const Section &section) {
-  swift::SwiftObjectFileFormatELF file_format;
-  return file_format.sectionContainsReflectionData(
-      section.GetName().GetStringRef());
-}
-#endif // LLDB_ENABLE_SWIFT

lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.h

@@ -401,11 +401,6 @@ class ObjectFileELF : public lldb_private::ObjectFile {
 
   llvm::StringRef
   GetReflectionSectionIdentifier(swift::ReflectionSectionKind section) override;
-
-#ifdef LLDB_ENABLE_SWIFT
-  bool
-  CanContainSwiftReflectionData(const lldb_private::Section &section) override;
-#endif // LLDB_ENABLE_SWIFT
 };
 
 #endif // LLDB_SOURCE_PLUGINS_OBJECTFILE_ELF_OBJECTFILEELF_H

lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp

@@ -6956,14 +6956,6 @@ llvm::StringRef ObjectFileMachO::GetReflectionSectionIdentifier(
 #endif //LLDB_ENABLE_SWIFT
 }
 
-#ifdef LLDB_ENABLE_SWIFT
-bool ObjectFileMachO::CanContainSwiftReflectionData(const Section &section) {
-  swift::SwiftObjectFileFormatMachO file_format;
-  return file_format.sectionContainsReflectionData(
-      section.GetName().GetStringRef());
-}
-#endif // LLDB_ENABLE_SWIFT
-
 ObjectFileMachO::MachOCorefileAllImageInfos
 ObjectFileMachO::GetCorefileAllImageInfos() {
   MachOCorefileAllImageInfos image_infos;

lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.h

@@ -231,11 +231,6 @@ class ObjectFileMachO : public lldb_private::ObjectFile {
   llvm::StringRef
   GetReflectionSectionIdentifier(swift::ReflectionSectionKind section) override;
 
-#ifdef LLDB_ENABLE_SWIFT
-  bool
-  CanContainSwiftReflectionData(const lldb_private::Section &section) override;
-#endif // LLDB_ENABLE_SWIFT
-
   /// A corefile may include metadata about all of the binaries that were
   /// present in the process when the corefile was taken.  This is only
   /// implemented for Mach-O files for now; we'll generalize it when we

lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp

@@ -1444,11 +1444,3 @@ llvm::StringRef ObjectFilePECOFF::GetReflectionSectionIdentifier(
   llvm_unreachable("Swift support disabled");
 #endif //LLDB_ENABLE_SWIFT
 }
-
-#ifdef LLDB_ENABLE_SWIFT
-bool ObjectFilePECOFF::CanContainSwiftReflectionData(const Section &section) {
-  swift::SwiftObjectFileFormatCOFF file_format;
-  return file_format.sectionContainsReflectionData(
-      section.GetName().GetStringRef());
-}
-#endif // LLDB_ENABLE_SWIFT

lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h

@@ -268,11 +268,6 @@ class ObjectFilePECOFF : public lldb_private::ObjectFile {
   llvm::StringRef
   GetReflectionSectionIdentifier(swift::ReflectionSectionKind section) override;
 
-#ifdef LLDB_ENABLE_SWIFT
-  bool
-  CanContainSwiftReflectionData(const lldb_private::Section &section) override;
-#endif // LLDB_ENABLE_SWIFT
-
   typedef std::vector<section_header_t> SectionHeaderColl;
   typedef SectionHeaderColl::iterator SectionHeaderCollIter;
   typedef SectionHeaderColl::const_iterator SectionHeaderCollConstIter;