Merge pull request #22150 from DougGregor/remote-ast-extensions

Author: swift-ci

include/swift/ABI/Metadata.h

@@ -1547,10 +1547,10 @@ class TargetProtocolDescriptorRef {
   /// is clear).
   StoredPointer storage;
 
+public:
   constexpr TargetProtocolDescriptorRef(StoredPointer storage)
     : storage(storage) { }
 
-public:
   constexpr TargetProtocolDescriptorRef() : storage() { }
 
   TargetProtocolDescriptorRef(
@@ -2519,7 +2519,6 @@ class TargetGenericRequirementDescriptor {
   /// The type that's constrained, described as a mangled name.
   RelativeDirectPointer<const char, /*nullable*/ false> Param;
 
-private:
   union {
     /// A mangled representation of the same-type or base class the param is
     /// constrained to.
@@ -2544,7 +2543,6 @@ class TargetGenericRequirementDescriptor {
     GenericRequirementLayoutKind Layout;
   };
 
-public:
   constexpr GenericRequirementFlags getFlags() const {
     return Flags;
   }
@@ -2784,6 +2782,7 @@ struct TargetExtensionContextDescriptor final
   using TrailingGenericContextObjects
     = TrailingGenericContextObjects<TargetExtensionContextDescriptor<Runtime>>;
 
+public:
   /// A mangling of the `Self` type context that the extension extends.
   /// The mangled name represents the type in the generic context encoded by
   /// this descriptor. For example, a nongeneric nominal type extension will
@@ -2794,7 +2793,6 @@ struct TargetExtensionContextDescriptor final
   /// extension is declared inside.
   RelativeDirectPointer<const char> ExtendedContext;
 
-public:
   using TrailingGenericContextObjects::getGenericContext;
 
   StringRef getMangledExtendedContext() const {

include/swift/Demangling/Demangler.h

@@ -507,7 +507,13 @@ class Demangler : public NodeFactory {
                           std::function<SymbolicReferenceResolver_t> resolver) {
     SymbolicReferenceResolver = resolver;
   }
-  
+
+  /// Take the symbolic reference resolver.
+  std::function<SymbolicReferenceResolver_t> &&
+  takeSymbolicReferenceResolver() {
+    return std::move(SymbolicReferenceResolver);
+  }
+
   /// Demangle the given symbol and return the parse tree.
   ///
   /// \param MangledName The mangled symbol string, which start with the