SwiftReflectionContext: Remove dependency on SwiftRemoteMirror header

Although mechanically it's not a circular dependency yet, conceptually
it is. Use RemoteAddress instead of the raw addr_t typedef.

Author: bitjammer

include/swift/Reflection/ReflectionContext.h

@@ -24,7 +24,6 @@
 #include "swift/Reflection/TypeLowering.h"
 #include "swift/Reflection/TypeRef.h"
 #include "swift/Reflection/TypeRefBuilder.h"
-#include "swift/SwiftRemoteMirror/MemoryReaderInterface.h"
 
 #include <iostream>
 #include <vector>
@@ -121,10 +120,10 @@ class ReflectionContext
   }
 
   bool
-  projectExistential(addr_t ExistentialAddress,
+  projectExistential(RemoteAddress ExistentialAddress,
                      const TypeRef *ExistentialTR,
                      const TypeRef **OutInstanceTR,
-                     addr_t *OutInstanceAddress) {
+                     RemoteAddress *OutInstanceAddress) {
     if (ExistentialTR == nullptr)
       return false;
 
@@ -161,7 +160,8 @@ class ReflectionContext
       // auto PointerArray = reinterpret_cast<uintptr_t*>(ExistentialAddress);
       // uintptr_t MetadataAddress = PointerArray[Offset];
       auto MetadataAddressAddress
-        = RemoteAddress(ExistentialAddress + ExistentialMetadataField->Offset);
+        = RemoteAddress(ExistentialAddress.getAddressData() +
+                        ExistentialMetadataField->Offset);
 
       StoredPointer MetadataAddress = 0;
       if (!getReader().readInteger(MetadataAddressAddress, &MetadataAddress))
@@ -186,11 +186,10 @@ class ReflectionContext
         // of the container has the address to that box.
         StoredPointer BoxAddress = 0;
 
-        if (!getReader().readInteger(RemoteAddress(ExistentialAddress),
-                                    &BoxAddress))
+        if (!getReader().readInteger(ExistentialAddress, &BoxAddress))
           return false;
 
-        *OutInstanceAddress = BoxAddress;
+        *OutInstanceAddress = RemoteAddress(BoxAddress);
       }
       return true;
     }

stdlib/public/SwiftRemoteMirror/SwiftRemoteMirror.cpp

@@ -252,8 +252,20 @@ int swift_reflection_projectExistential(SwiftReflectionContextRef ContextRef,
                                         addr_t *StartOfInstanceData) {
   auto Context = reinterpret_cast<NativeReflectionContext *>(ContextRef);
   auto ExistentialTR = reinterpret_cast<const TypeRef *>(ExistentialTypeRef);
-  return Context->projectExistential(ExistentialAddress, ExistentialTR,
-    reinterpret_cast<const TypeRef **>(InstanceTypeRef), StartOfInstanceData);
+  auto RemoteExistentialAddress = RemoteAddress(ExistentialAddress);
+  const TypeRef *InstanceTR = nullptr;
+  RemoteAddress RemoteStartOfInstanceData(nullptr);
+  auto Success = Context->projectExistential(RemoteExistentialAddress,
+                                             ExistentialTR,
+                                             &InstanceTR,
+                                             &RemoteStartOfInstanceData);
+
+  if (Success) {
+    *InstanceTypeRef = reinterpret_cast<swift_typeref_t>(InstanceTR);
+    *StartOfInstanceData = RemoteStartOfInstanceData.getAddressData();
+  }
+
+  return Success;
 }
 
 void swift_reflection_dumpTypeRef(swift_typeref_t OpaqueTypeRef) {