Merge pull request #64056 from augusto2112/type-info-prov-id-rebranch

Allow TypeInfoProviders to identify themselves

Author: augusto2112

include/swift/Remote/TypeInfoProvider.h

@@ -17,6 +17,7 @@
 #ifndef SWIFT_REMOTE_TYPEINFOPROVIDER_H
 #define SWIFT_REMOTE_TYPEINFOPROVIDER_H
 
+#include <stdint.h>
 namespace swift {
 namespace reflection {
 class TypeInfo;
@@ -25,13 +26,22 @@ namespace remote {
 
 /// An abstract interface for providing external type layout information.
 struct TypeInfoProvider {
+  using IdType = void *;
+
   virtual ~TypeInfoProvider() = default;
 
   /// Attempt to read type information about (Clang)imported types that are not
   /// represented in the metadata. LLDB can read this information from debug
   /// info, for example.
   virtual const reflection::TypeInfo *
   getTypeInfo(llvm::StringRef mangledName) = 0;
+
+  /// A key that can be used to identify the type info provider (for example, 
+  /// for caching purposes).
+  virtual IdType getId() {
+    // Default implementation is the instance's ID.
+    return (void *) this;
+  }
 };
 
 } // namespace remote

include/swift/RemoteInspection/TypeLowering.h

@@ -328,7 +328,7 @@ class ReferenceTypeInfo : public TypeInfo {
 class TypeConverter {
   TypeRefBuilder &Builder;
   std::vector<std::unique_ptr<const TypeInfo>> Pool;
-  llvm::DenseMap<std::pair<const TypeRef *, remote::TypeInfoProvider *>,
+  llvm::DenseMap<std::pair<const TypeRef *, remote::TypeInfoProvider::IdType>,
                  const TypeInfo *> Cache;
   llvm::DenseSet<const TypeRef *> RecursionCheck;
   llvm::DenseMap<std::pair<unsigned, unsigned>,

stdlib/public/RemoteInspection/TypeLowering.cpp

@@ -2584,8 +2584,10 @@ TypeConverter::getTypeInfo(const TypeRef *TR,
     return nullptr;
   }
 
+  auto ExternalTypeInfoId =
+      ExternalTypeInfo ? ExternalTypeInfo->getId() : 0;
   // See if we already computed the result
-  auto found = Cache.find({TR, ExternalTypeInfo});
+  auto found = Cache.find({TR, ExternalTypeInfoId});
   if (found != Cache.end())
     return found->second;
 
@@ -2598,7 +2600,7 @@ TypeConverter::getTypeInfo(const TypeRef *TR,
 
   // Compute the result and cache it
   auto *TI = LowerType(*this, ExternalTypeInfo).visit(TR);
-  Cache.insert({{TR, ExternalTypeInfo}, TI});
+  Cache.insert({{TR, ExternalTypeInfoId}, TI});
 
   RecursionCheck.erase(TR);