Merge pull request #41209 from apple/reflection-symbol-use-release-5.6

[Reflection] Changes to support LLDBMemoryReader

Author: kastiglione

include/swift/ABI/ObjectFile.h

@@ -28,6 +28,8 @@ class SwiftObjectFileFormat {
 public:
   virtual ~SwiftObjectFileFormat() {}
   virtual llvm::StringRef getSectionName(ReflectionSectionKind section) = 0;
+  /// Predicate to identify if the named section can contain reflection data.
+  virtual bool sectionContainsReflectionData(llvm::StringRef sectionName) = 0;
 };
 
 /// Responsible for providing the Mach-O reflection section identifiers.
@@ -50,6 +52,10 @@ class SwiftObjectFileFormatMachO : public SwiftObjectFileFormat {
     }
     llvm_unreachable("Section type not found.");
   }
+
+  bool sectionContainsReflectionData(llvm::StringRef sectionName) override {
+    return sectionName.startswith("__swift5_") || sectionName == "__const";
+  }
 };
 
 /// Responsible for providing the ELF reflection section identifiers.
@@ -72,6 +78,10 @@ class SwiftObjectFileFormatELF : public SwiftObjectFileFormat {
     }
     llvm_unreachable("Section type not found.");
   }
+
+  bool sectionContainsReflectionData(llvm::StringRef sectionName) override {
+    return sectionName.startswith("swift5_");
+  }
 };
 
 /// Responsible for providing the COFF reflection section identifiers
@@ -94,6 +104,10 @@ class SwiftObjectFileFormatCOFF : public SwiftObjectFileFormat {
     }
     llvm_unreachable("Section  not found.");
   }
+
+  bool sectionContainsReflectionData(llvm::StringRef sectionName) override {
+    return sectionName.startswith(".sw5");
+  }
 };
 } // namespace swift
 #endif // SWIFT_ABI_OBJECTFILE_H

include/swift/Remote/MetadataReader.h

@@ -418,7 +418,11 @@ class MetadataReader {
           return nullptr;
         }
       } else {
-        resolved = RemoteAbsolutePointer("", remoteAddress);
+        resolved = Reader->resolvePointer(RemoteAddress(remoteAddress), 0);
+        if (resolved.getSymbol().empty()) {
+          // No symbol found, use the already calculated address.
+          resolved = RemoteAbsolutePointer("", remoteAddress);
+        }
       }
 
       switch (kind) {