Merge pull request #3848 from apple/lldb-Implement-LLDBMemoryReader-resolvePointer

[lldb] Implement LLDBMemoryReader::resolvePointer

(cherry picked from commit bb7505d)
(cherry picked from commit 201ddc5)

Author: kastiglione

lldb/include/lldb/Core/Section.h

@@ -201,6 +201,8 @@ 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

@@ -708,6 +708,12 @@ 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

@@ -376,6 +376,14 @@ 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

@@ -1,9 +1,12 @@
 #include "LLDBMemoryReader.h"
+#include "lldb/Core/Address.h"
 #include "lldb/Core/Section.h"
 #include "lldb/Utility/LLDBLog.h"
 #include "lldb/Utility/Log.h"
+#include "lldb/Utility/Logging.h"
 
 #include "llvm/Support/MathExtras.h"
+#include "swift/Demangling/Demangle.h"
 
 using namespace lldb;
 using namespace lldb_private;

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

@@ -3429,3 +3429,11 @@ 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

@@ -396,6 +396,11 @@ 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

@@ -6900,6 +6900,23 @@ llvm::StringRef ObjectFileMachO::GetReflectionSectionIdentifier(
 #endif //LLDB_ENABLE_SWIFT
 }
 
+#ifdef LLDB_ENABLE_SWIFT
+bool ObjectFileMachO::CanContainSwiftReflectionData(const Section &section) {
+  swift::SwiftObjectFileFormatMachO file_format;
+  if (file_format.sectionContainsReflectionData(
+          section.GetName().GetStringRef()))
+    return true;
+  // Some section names are not unique, such as `__const`, which could be in
+  // `__TEXT` or `__DATA`. For these, also check the segment,section name.
+  if (auto segment = section.GetParent()) {
+    std::string segmentSectionName =
+        llvm::formatv("{0},{1}", segment->GetName(), section.GetName()).str();
+    return file_format.sectionContainsReflectionData(segmentSectionName);
+  }
+  return false;
+}
+#endif // LLDB_ENABLE_SWIFT
+
 ObjectFileMachO::MachOCorefileAllImageInfos
 ObjectFileMachO::GetCorefileAllImageInfos() {
   MachOCorefileAllImageInfos image_infos;

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

@@ -220,6 +220,11 @@ 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

@@ -1194,13 +1194,10 @@ ObjectFile::Type ObjectFilePECOFF::CalculateType() {
 
 ObjectFile::Strata ObjectFilePECOFF::CalculateStrata() { return eStrataUser; }
 
-llvm::StringRef ObjectFilePECOFF::GetReflectionSectionIdentifier(
-    swift::ReflectionSectionKind section) {
 #ifdef LLDB_ENABLE_SWIFT
-  swift::SwiftObjectFileFormatCOFF file_format_coff;
-  return file_format_coff.getSectionName(section);
-#else
-  llvm_unreachable("Swift support disabled");
-#endif //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

@@ -288,6 +288,11 @@ 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;