Make MetadataPromise private (NFC)

The only code path this is used now is RemoteAST.

Author: adrian-prantl

lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.cpp

@@ -272,12 +272,6 @@ class SwiftLanguageRuntimeStub {
     return {};
   }
 
-  SwiftLanguageRuntime::MetadataPromiseSP
-  GetMetadataPromise(lldb::addr_t addr, ValueObject &for_object) {
-    STUB_LOG();
-    return {};
-  }
-
   void ModulesDidLoad(const ModuleList &module_list) {}
 
   bool IsStoredInlineInBuffer(CompilerType type) {
@@ -2392,12 +2386,6 @@ CompilerType SwiftLanguageRuntime::GetTypeFromMetadata(TypeSystemSwift &tss,
   FORWARD(GetTypeFromMetadata, tss, addr);
 }
 
-SwiftLanguageRuntime::MetadataPromiseSP
-SwiftLanguageRuntime::GetMetadataPromise(lldb::addr_t addr,
-                                         ValueObject &for_object) {
-  FORWARD(GetMetadataPromise, addr, for_object);
-}
-
 bool SwiftLanguageRuntime::IsStoredInlineInBuffer(CompilerType type) {
   FORWARD(IsStoredInlineInBuffer, type);
 }

lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.h

@@ -74,9 +74,6 @@ class SwiftLanguageRuntime : public LanguageRuntime {
   std::unique_ptr<SwiftLanguageRuntimeImpl> m_impl;
 
 public:
-  class MetadataPromise;
-  typedef std::shared_ptr<MetadataPromise> MetadataPromiseSP;
-
   static char ID;
 
   bool isA(const void *ClassID) const override {
@@ -238,24 +235,6 @@ class SwiftLanguageRuntime : public LanguageRuntime {
   CompilerType GetConcreteType(ExecutionContextScope *exe_scope,
                                ConstString abstract_type_name) override;
 
-  /// A proxy object to support lazy binding of Archetypes.
-  class MetadataPromise {
-    friend class SwiftLanguageRuntimeImpl;
-
-    MetadataPromise(ValueObject &, SwiftLanguageRuntimeImpl &, lldb::addr_t);
-
-    lldb::ValueObjectSP m_for_object_sp;
-    SwiftLanguageRuntimeImpl &m_swift_runtime;
-    lldb::addr_t m_metadata_location;
-    llvm::Optional<swift::MetadataKind> m_metadata_kind;
-    llvm::Optional<CompilerType> m_compiler_type;
-
-  public:
-    CompilerType FulfillTypePromise(Status *error = nullptr);
-  };
-
-  MetadataPromiseSP GetMetadataPromise(lldb::addr_t addr,
-                                       ValueObject &for_object);
   CompilerType GetTypeFromMetadata(TypeSystemSwift &tss, Address address);
   /// Build the artificial type metadata variable name for \p swift_type.
   static bool GetAbstractTypeName(StreamString &name, swift::Type swift_type);

lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntimeDynamicTypeResolution.cpp

@@ -472,14 +472,14 @@ void SwiftLanguageRuntimeImpl::PopLocalBuffer() {
   ((LLDBMemoryReader *)GetMemoryReader().get())->popLocalBuffer();
 }
 
-SwiftLanguageRuntime::MetadataPromise::MetadataPromise(
+SwiftLanguageRuntimeImpl::MetadataPromise::MetadataPromise(
     ValueObject &for_object, SwiftLanguageRuntimeImpl &runtime,
     lldb::addr_t location)
     : m_for_object_sp(for_object.GetSP()), m_swift_runtime(runtime),
       m_metadata_location(location) {}
 
 CompilerType
-SwiftLanguageRuntime::MetadataPromise::FulfillTypePromise(Status *error) {
+SwiftLanguageRuntimeImpl::MetadataPromise::FulfillTypePromise(Status *error) {
   if (error)
     error->Clear();
 
@@ -532,7 +532,7 @@ SwiftLanguageRuntime::MetadataPromise::FulfillTypePromise(Status *error) {
   }
 }
 
-SwiftLanguageRuntime::MetadataPromiseSP
+SwiftLanguageRuntimeImpl::MetadataPromiseSP
 SwiftLanguageRuntimeImpl::GetMetadataPromise(lldb::addr_t addr,
                                              ValueObject &for_object) {
   llvm::Optional<SwiftScratchContextReader> maybe_swift_scratch_ctx =
@@ -555,8 +555,8 @@ SwiftLanguageRuntimeImpl::GetMetadataPromise(lldb::addr_t addr,
   if (iter != m_promises_map.end())
     return iter->second;
 
-  SwiftLanguageRuntime::MetadataPromiseSP promise_sp(
-      new SwiftLanguageRuntime::MetadataPromise(for_object, *this, addr));
+  SwiftLanguageRuntimeImpl::MetadataPromiseSP promise_sp(
+      new SwiftLanguageRuntimeImpl::MetadataPromise(for_object, *this, addr));
   m_promises_map.insert({key, promise_sp});
   return promise_sp;
 }
@@ -2361,7 +2361,7 @@ SwiftLanguageRuntimeImpl::GetTypeMetadataForTypeNameAndFrame(
   return metadata_location;
 }
 
-  SwiftLanguageRuntime::MetadataPromiseSP
+SwiftLanguageRuntimeImpl::MetadataPromiseSP
 SwiftLanguageRuntimeImpl::GetPromiseForTypeNameAndFrame(const char *type_name,
                                                         StackFrame *frame) {
   if (!frame || !type_name || !type_name[0])
@@ -3556,7 +3556,7 @@ SwiftLanguageRuntimeImpl::GetConcreteType(ExecutionContextScope *exe_scope,
   if (!frame)
     return CompilerType();
 
-  SwiftLanguageRuntime::MetadataPromiseSP promise_sp(
+  SwiftLanguageRuntimeImpl::MetadataPromiseSP promise_sp(
       GetPromiseForTypeNameAndFrame(abstract_type_name.GetCString(), frame));
   if (!promise_sp)
     return CompilerType();

lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntimeImpl.h

@@ -108,8 +108,6 @@ class SwiftLanguageRuntimeImpl {
                                          ExecutionContextScope *exe_scope);
 
   CompilerType GetTypeFromMetadata(TypeSystemSwift &tss, Address address);
-  SwiftLanguageRuntime::MetadataPromiseSP
-  GetMetadataPromise(lldb::addr_t addr, ValueObject &for_object);
 
   llvm::Optional<uint64_t>
   GetMemberVariableOffsetRemoteAST(CompilerType instance_type,
@@ -346,7 +344,26 @@ class SwiftLanguageRuntimeImpl {
                                           Address &address,
                                           Value::ValueType &value_type);
 
-  SwiftLanguageRuntime::MetadataPromiseSP
+  /// A proxy object to support lazy binding of Archetypes.
+  class MetadataPromise {
+    friend class SwiftLanguageRuntimeImpl;
+
+    MetadataPromise(ValueObject &, SwiftLanguageRuntimeImpl &, lldb::addr_t);
+
+    lldb::ValueObjectSP m_for_object_sp;
+    SwiftLanguageRuntimeImpl &m_swift_runtime;
+    lldb::addr_t m_metadata_location;
+    llvm::Optional<swift::MetadataKind> m_metadata_kind;
+    llvm::Optional<CompilerType> m_compiler_type;
+
+  public:
+    CompilerType FulfillTypePromise(Status *error = nullptr);
+  };
+  typedef std::shared_ptr<MetadataPromise> MetadataPromiseSP;
+
+  MetadataPromiseSP GetMetadataPromise(lldb::addr_t addr,
+                                       ValueObject &for_object);
+  MetadataPromiseSP
   GetPromiseForTypeNameAndFrame(const char *type_name, StackFrame *frame);
 
   llvm::Optional<lldb::addr_t>
@@ -377,7 +394,7 @@ class SwiftLanguageRuntimeImpl {
   std::shared_ptr<LLDBMemoryReader> m_memory_reader_sp;
 
   llvm::DenseMap<std::pair<swift::ASTContext *, lldb::addr_t>,
-                 SwiftLanguageRuntime::MetadataPromiseSP>
+                 MetadataPromiseSP>
       m_promises_map;
 
   llvm::DenseMap<swift::ASTContext *,