Merge pull request swiftlang#22144 from DougGregor/remote-ast-local-types

 [Remote AST] Resolve local types using anonymous context descriptor mangling.

Author: DougGregor

include/swift/AST/Module.h

@@ -1052,6 +1052,8 @@ class SourceFile final : public FileUnit {
   virtual void
   getPrecedenceGroups(SmallVectorImpl<PrecedenceGroupDecl*> &results) const override;
 
+  virtual TypeDecl *lookupLocalType(llvm::StringRef MangledName) const override;
+
   virtual void
   getLocalTypeDecls(SmallVectorImpl<TypeDecl*> &results) const override;
 

include/swift/Remote/MetadataReader.h

@@ -1423,13 +1423,38 @@ class MetadataReader {
     return name;
   }
 
+  /// Read and demangle the name of an anonymous context.
+  Demangle::NodePointer demangleAnonymousContextName(
+      ContextDescriptorRef contextRef,
+      Demangler &dem) {
+    auto anonymousBuffer = cast<TargetAnonymousContextDescriptor<Runtime>>(
+        contextRef.getLocalBuffer());
+
+    if (!anonymousBuffer->hasMangledName())
+      return nullptr;
+
+    // Read the mangled name.
+    auto mangledContextName = anonymousBuffer->getMangledContextName();
+    auto mangledNameAddress = resolveRelativeField(contextRef,
+                                                   mangledContextName->name);
+
+    std::string mangledName;
+    if (!Reader->readString(RemoteAddress(mangledNameAddress), mangledName))
+      return nullptr;
+
+    return dem.demangleSymbol(mangledName);
+  }
+
   /// If we have a context whose parent context is an anonymous context
   /// that provides the local/private name for the current context,
   /// produce a mangled node describing the name of \c context.
   Demangle::NodePointer
   adoptAnonymousContextName(ContextDescriptorRef contextRef,
                             Optional<ContextDescriptorRef> &parentContextRef,
-                            Demangler &dem) {
+                            Demangler &dem,
+                            Demangle::NodePointer &outerNode) {
+    outerNode = nullptr;
+
     if (!parentContextRef || !*parentContextRef)
       return nullptr;
 
@@ -1444,21 +1469,7 @@ class MetadataReader {
     if (!anonymousParent)
       return nullptr;
 
-    // Only perform this transformation when we have a mangled name describing
-    // the context.
-    if (!anonymousParent->hasMangledName())
-      return nullptr;
-
-    // Read the mangled name.
-    auto mangledContextName = anonymousParent->getMangledContextName();
-    auto mangledNameAddress = resolveRelativeField(*parentContextRef,
-                                                   mangledContextName->name);
-
-    std::string mangledName;
-    if (!Reader->readString(RemoteAddress(mangledNameAddress), mangledName))
-      return nullptr;
-
-    auto mangledNode = dem.demangleSymbol(mangledName);
+    auto mangledNode = demangleAnonymousContextName(*parentContextRef, dem);
     if (!mangledNode)
       return nullptr;
 
@@ -1469,9 +1480,9 @@ class MetadataReader {
       return nullptr;
 
     // Dig out the name of the entity.
-    // FIXME: LocalDeclName
     NodePointer nameChild = mangledNode->getChild(1);
-    if (nameChild->getKind() != Node::Kind::PrivateDeclName ||
+    if ((nameChild->getKind() != Node::Kind::PrivateDeclName &&
+         nameChild->getKind() != Node::Kind::LocalDeclName) ||
         nameChild->getNumChildren() < 2)
       return nullptr;
 
@@ -1497,6 +1508,9 @@ class MetadataReader {
     // context entirely.
     parentContextRef = readParentContextDescriptor(*parentContextRef);
 
+    // The outer node is the first child.
+    outerNode = mangledNode->getChild(0);
+
     // Return the name.
     return nameChild;
   }
@@ -1509,8 +1523,9 @@ class MetadataReader {
 
     // If the parent is an anonymous context that provides a complete
     // name for this node, note that.
+    NodePointer demangledParentNode = nullptr;
     auto nameNode = adoptAnonymousContextName(
-        descriptor, parentDescriptorResult, dem);
+        descriptor, parentDescriptorResult, dem, demangledParentNode);
 
     // If there was a problem reading the parent descriptor, we're done.
     if (!parentDescriptorResult) return nullptr;
@@ -1520,10 +1535,18 @@ class MetadataReader {
     if (auto parentDescriptor = *parentDescriptorResult) {
       parentDemangling =
         buildContextDescriptorMangling(parentDescriptor, dem);
-      if (!parentDemangling)
+      if (!parentDemangling && !demangledParentNode)
         return nullptr;
     }
 
+    // If we have a better parent node produced from an enclosing nominal
+    // context, use that.
+    if (demangledParentNode &&
+        (!parentDemangling ||
+         parentDemangling->getKind() == Node::Kind::AnonymousContext)) {
+      parentDemangling = demangledParentNode;
+    }
+
     Demangle::Node::Kind nodeKind;
     Optional<TypeImportInfo<std::string>> importInfo;
 

lib/AST/Module.cpp

@@ -32,6 +32,7 @@
 #include "swift/AST/PrettyStackTrace.h"
 #include "swift/AST/PrintOptions.h"
 #include "swift/AST/ProtocolConformance.h"
+#include "swift/AST/TypeCheckRequests.h"
 #include "swift/Basic/Compiler.h"
 #include "swift/Basic/SourceManager.h"
 #include "swift/Basic/Statistic.h"
@@ -565,6 +566,22 @@ void SourceFile::getLocalTypeDecls(SmallVectorImpl<TypeDecl*> &Results) const {
   Results.append(LocalTypeDecls.begin(), LocalTypeDecls.end());
 }
 
+TypeDecl *SourceFile::lookupLocalType(llvm::StringRef mangledName) const {
+  ASTContext &ctx = getASTContext();
+  for (auto typeDecl : LocalTypeDecls) {
+    auto typeMangledName = evaluateOrDefault(ctx.evaluator,
+                                             USRGenerationRequest { typeDecl },
+                                             std::string());
+    if (typeMangledName.find("s:") == 0)
+      typeMangledName = typeMangledName.substr(2);
+
+    if (mangledName == typeMangledName)
+      return typeDecl;
+  }
+
+  return nullptr;
+}
+
 void ModuleDecl::getDisplayDecls(SmallVectorImpl<Decl*> &Results) const {
   // FIXME: Should this do extra access control filtering?
   FORWARD(getDisplayDecls, (Results));

test/RemoteAST/nominal_types.swift

@@ -126,3 +126,14 @@ struct M<T, U> {
   }
 }
 M<Int, String>.testPrivate()
+
+struct N {
+  static func testPrivate() {
+    struct LocalStruct {
+      struct Inner { }
+    }
+    // CHECK: LocalStruct.Inner
+    printType(LocalStruct.Inner.self)
+  }
+}
+N.testPrivate()