[DRAFT][RemoteInspection] Replace StoredPointer with RemoteAddress

This patch is still in a draft stage.

Author: augusto2112

include/swift/Basic/RelativePointer.h

@@ -132,7 +132,9 @@
 #ifndef SWIFT_BASIC_RELATIVEPOINTER_H
 #define SWIFT_BASIC_RELATIVEPOINTER_H
 
+#include <cassert>
 #include <cstdint>
+#include <type_traits>
 
 namespace swift {
 

include/swift/Remote/CMemoryReader.h

@@ -68,6 +68,7 @@ class CMemoryReader final : public MemoryReader {
   // Check to see if an address has bits outside the ptrauth mask. This suggests
   // that we're likely failing to strip a signed pointer when reading from it.
   bool hasSignatureBits(RemoteAddress address) {
+    return false;
     uint64_t addressData = address.getAddressData();
     return addressData != (addressData & getPtrauthMask());
   }
@@ -88,7 +89,7 @@ class CMemoryReader final : public MemoryReader {
   RemoteAddress getSymbolAddress(const std::string &name) override {
     auto addressData = Impl.getSymbolAddress(Impl.reader_context,
                                              name.c_str(), name.size());
-    return RemoteAddress(addressData);
+    return RemoteAddress::makeAddress(addressData);
   }
 
   uint64_t getStringLength(RemoteAddress address) {

include/swift/Remote/MemoryReader.h

@@ -57,13 +57,20 @@ class MemoryReader {
   ///
   /// Returns false if the operation failed.
   virtual bool readString(RemoteAddress address, std::string &dest) = 0;
-  
+
+  virtual bool readRemoteAddress(RemoteAddress address, RemoteAddress &out) {
+    return readInteger(address, &out.getDataReference());
+  }
   /// Attempts to read an integer from the given address in the remote
   /// process.
   ///
   /// Returns false if the operation failed.
   template <typename IntegerType>
   bool readInteger(RemoteAddress address, IntegerType *dest) {
+    static_assert(!std::is_same<RemoteAddress, IntegerType>(),
+                  "RemoteAddress cannot be read in directly, use "
+                  "readRemoteAddress instead.");
+
     return readBytes(address, reinterpret_cast<uint8_t*>(dest),
                      sizeof(IntegerType));
   }
@@ -147,7 +154,7 @@ class MemoryReader {
   virtual RemoteAbsolutePointer resolvePointer(RemoteAddress address,
                                                uint64_t readValue) {
     // Default implementation returns the read value as is.
-    return RemoteAbsolutePointer("", readValue);
+    return RemoteAbsolutePointer("", address.fromThis(readValue));
   }
 
   /// Performs the inverse operation of \ref resolvePointer.
@@ -166,7 +173,7 @@ class MemoryReader {
   virtual RemoteAbsolutePointer getSymbol(RemoteAddress address) {
     if (auto symbol = resolvePointerAsSymbol(address))
       return *symbol;
-    return RemoteAbsolutePointer("", address.getAddressData());
+    return RemoteAbsolutePointer("", address);
   }
 
   /// Lookup a dynamic symbol name (ie dynamic loader binding) for the given
@@ -263,7 +270,7 @@ class MemoryReader {
   virtual ~MemoryReader() = default;
 };
 
-} // end namespace reflection
+} // end namespace remote
 } // end namespace swift
 
 #endif // SWIFT_REFLECTION_READER_H