AST: Add MangleLocalTypeDeclRequest

Author: slavapestov

include/swift/AST/ASTMangler.h

@@ -176,6 +176,8 @@ class ASTMangler : public Mangler {
                                         const AbstractStorageDecl *decl,
                                         StringRef USRPrefix);
 
+  std::string mangleLocalTypeDecl(const TypeDecl *type);
+
   enum SpecialContext {
     ObjCContext,
     ClangImporterContext,

include/swift/AST/TypeCheckRequests.h

@@ -311,7 +311,32 @@ class USRGenerationRequest :
   friend SimpleRequest;
 
   // Evaluation.
-  llvm::Expected<std::string> evaluate(Evaluator &eval, const ValueDecl* d) const;
+  llvm::Expected<std::string> evaluate(Evaluator &eval, const ValueDecl *d) const;
+
+public:
+  // Cycle handling
+  void diagnoseCycle(DiagnosticEngine &diags) const;
+  void noteCycleStep(DiagnosticEngine &diags) const;
+
+  // Caching
+  bool isCached() const { return true; }
+};
+
+/// Generate the mangling for the given local type declaration.
+class MangleLocalTypeDeclRequest :
+    public SimpleRequest<MangleLocalTypeDeclRequest,
+                         CacheKind::Cached,
+                         std::string,
+                         const TypeDecl*>
+{
+public:
+  using SimpleRequest::SimpleRequest;
+
+private:
+  friend SimpleRequest;
+
+  // Evaluation.
+  llvm::Expected<std::string> evaluate(Evaluator &eval, const TypeDecl *d) const;
 
 public:
   // Cycle handling

include/swift/AST/TypeCheckerTypeIDZone.def

@@ -23,3 +23,4 @@ SWIFT_TYPEID(IsDynamicRequest)
 SWIFT_TYPEID(RequirementRequest)
 SWIFT_TYPEID(USRGenerationRequest)
 SWIFT_TYPEID(DefaultTypeRequest)
+SWIFT_TYPEID(MangleLocalTypeDeclRequest)

lib/AST/ASTMangler.cpp

@@ -506,6 +506,22 @@ std::string ASTMangler::mangleAccessorEntityAsUSR(AccessorKind kind,
   return finalize();
 }
 
+std::string ASTMangler::mangleLocalTypeDecl(const TypeDecl *type) {
+  beginManglingWithoutPrefix();
+  AllowNamelessEntities = true;
+  OptimizeProtocolNames = false;
+
+  if (auto GTD = dyn_cast<GenericTypeDecl>(type)) {
+    appendAnyGenericType(GTD);
+  } else {
+    assert(isa<AssociatedTypeDecl>(type));
+    appendContextOf(type);
+    appendDeclName(type);
+    appendOperator("Qa");
+  }
+
+  return finalize();
+}
 
 void ASTMangler::appendSymbolKind(SymbolKind SKind) {
   switch (SKind) {

lib/AST/TypeCheckRequests.cpp

@@ -431,6 +431,22 @@ void USRGenerationRequest::noteCycleStep(DiagnosticEngine &diags) const {
   diags.diagnose(d, diag::circular_reference);
 }
 
+//----------------------------------------------------------------------------//
+// Mangled local type name computation.
+//----------------------------------------------------------------------------//
+
+void MangleLocalTypeDeclRequest::diagnoseCycle(DiagnosticEngine &diags) const {
+  const auto &storage = getStorage();
+  auto &d = std::get<0>(storage);
+  diags.diagnose(d, diag::circular_reference);
+}
+
+void MangleLocalTypeDeclRequest::noteCycleStep(DiagnosticEngine &diags) const {
+  const auto &storage = getStorage();
+  auto &d = std::get<0>(storage);
+  diags.diagnose(d, diag::circular_reference);
+}
+
 //----------------------------------------------------------------------------//
 // DefaultTypeRequest.
 //----------------------------------------------------------------------------//

lib/AST/USRGeneration.cpp

@@ -165,7 +165,8 @@ static bool shouldUseObjCUSR(const Decl *D) {
 }
 
 llvm::Expected<std::string>
-swift::USRGenerationRequest::evaluate(Evaluator &evaluator, const ValueDecl* D) const {
+swift::USRGenerationRequest::evaluate(Evaluator &evaluator,
+                                      const ValueDecl *D) const {
   if (!D->hasName() && !isa<ParamDecl>(D) && !isa<AccessorDecl>(D))
     return std::string(); // Ignore.
   if (D->getModuleContext()->isBuiltinModule())
@@ -249,6 +250,19 @@ swift::USRGenerationRequest::evaluate(Evaluator &evaluator, const ValueDecl* D)
   return NewMangler.mangleDeclAsUSR(D, getUSRSpacePrefix());
 }
 
+llvm::Expected<std::string>
+swift::MangleLocalTypeDeclRequest::evaluate(Evaluator &evaluator,
+                                            const TypeDecl *D) const {
+  if (!D->hasInterfaceType())
+    return std::string();
+
+  if (isa<ModuleDecl>(D))
+    return std::string(); // Ignore.
+
+  Mangle::ASTMangler NewMangler;
+  return NewMangler.mangleLocalTypeDecl(D);
+}
+
 bool ide::printModuleUSR(ModuleEntity Mod, raw_ostream &OS) {
   if (auto *D = Mod.getAsSwiftModule()) {
     StringRef moduleName = D->getName().str();