undo PrettyPrintCustomAttrRequest

Author: hnrklssn

include/swift/AST/TypeCheckRequests.h

@@ -775,27 +775,6 @@ class PrettyPrintDeclRequest
   bool isCached() const { return true; }
 };
 
-/// Pretty-print the given attribute into a buffer and return a source
-/// location that refers to the attribute in that buffer.
-class PrettyPrintCustomAttrRequest
-    : public SimpleRequest<PrettyPrintCustomAttrRequest,
-                           SourceLoc(const CustomAttr *, const Decl *),
-                           RequestFlags::Cached> {
-public:
-  using SimpleRequest::SimpleRequest;
-
-private:
-  friend SimpleRequest;
-
-  // Evaluation.
-  SourceLoc evaluate(Evaluator &eval, const CustomAttr *attr,
-                     const Decl *decl) const;
-
-public:
-  // Caching
-  bool isCached() const { return true; }
-};
-
 // Find the type in the cache or look it up
 class DefaultTypeRequest
     : public SimpleRequest<DefaultTypeRequest,

include/swift/AST/TypeCheckerTypeIDZone.def

@@ -81,8 +81,6 @@ SWIFT_REQUEST(TypeChecker, DefaultTypeRequest,
               NoLocationInfo)
 SWIFT_REQUEST(TypeChecker, PrettyPrintDeclRequest,
               SourceLoc(const Decl *), Cached, NoLocationInfo)
-SWIFT_REQUEST(TypeChecker, PrettyPrintCustomAttrRequest,
-              SourceLoc(const CustomAttr *), Cached, NoLocationInfo)
 SWIFT_REQUEST(TypeChecker, DifferentiableAttributeTypeCheckRequest,
               IndexSubset *(DifferentiableAttr *),
               SeparatelyCached, NoLocationInfo)

lib/Sema/TypeCheckDecl.cpp

@@ -3247,8 +3247,9 @@ namespace {
   };
 }
 
-static void collectQualifiedDeclNameComponents(
-    const Decl *decl, SmallVectorImpl<std::string> &nameComponents) {
+SourceLoc PrettyPrintDeclRequest::evaluate(Evaluator &eval, const Decl *decl) const {
+  // Conjure a buffer name for this declaration.
+  SmallVector<std::string, 4> nameComponents;
   DeclContext *dc;
   if (auto valueDecl = dyn_cast<ValueDecl>(decl)) {
     nameComponents.push_back(valueDecl->getBaseName().userFacingName().str());
@@ -3295,13 +3296,7 @@ static void collectQualifiedDeclNameComponents(
 
     dc = dc->getParent();
   }
-}
 
-SourceLoc PrettyPrintDeclRequest::evaluate(Evaluator &eval,
-                                           const Decl *decl) const {
-  // Conjure a buffer name for this declaration.
-  SmallVector<std::string, 4> nameComponents;
-  collectQualifiedDeclNameComponents(decl, nameComponents);
 
   std::string bufferName;
   {
@@ -3396,62 +3391,3 @@ SourceLoc PrettyPrintDeclRequest::evaluate(Evaluator &eval,
 
   return memBufferStartLoc.getAdvancedLoc(targetDeclOffsetInBuffer);
 }
-
-//----------------------------------------------------------------------------//
-// PrettyPrintCustomAttrRequest
-//----------------------------------------------------------------------------//
-
-SourceLoc PrettyPrintCustomAttrRequest::evaluate(Evaluator &eval,
-                                                 const CustomAttr *attr,
-                                                 const Decl *decl) const {
-  // Conjure a buffer name for this declaration.
-  SmallVector<std::string, 4> nameComponents;
-  nameComponents.push_back(attr->getAttrName().str());
-  collectQualifiedDeclNameComponents(decl, nameComponents);
-
-  std::string bufferName;
-  {
-    llvm::raw_string_ostream out(bufferName);
-    for (auto iter = nameComponents.rbegin(); iter != nameComponents.rend();
-         ++iter) {
-      out << *iter;
-
-      if (iter + 1 != nameComponents.rend())
-        out << ".";
-    }
-  }
-
-  // Render the buffer contents.
-  ASTContext &ctx = decl->getASTContext();
-  llvm::SmallString<128> bufferContents;
-  {
-    llvm::raw_svector_ostream out(bufferContents);
-    StreamPrinter P(out);
-
-    // Print this macro attribute.
-    auto options = PrintOptions::printForDiagnostics(
-        getBufferAccessLevel(decl), ctx.TypeCheckerOpts.PrintFullConvention);
-    attr->print(P, options, decl);
-  }
-
-  // Build a buffer with the pretty-printed macro attribute.
-  SourceManager &sourceMgr = ctx.SourceMgr;
-  auto bufferID = sourceMgr.addMemBufferCopy(bufferContents, bufferName);
-  auto memBufferStartLoc = sourceMgr.getLocForBufferStart(bufferID);
-
-  // Note that this is a pretty-printed buffer.
-  sourceMgr.setGeneratedSourceInfo(
-      bufferID,
-      GeneratedSourceInfo{
-          GeneratedSourceInfo::PrettyPrinted, CharSourceRange(),
-          CharSourceRange(memBufferStartLoc, bufferContents.size()),
-          ASTNode(const_cast<Decl *>(decl)).getOpaqueValue(), nullptr});
-
-  // Add a source file for the buffer.
-  auto moduleDecl = decl->getDeclContext()->getParentModule();
-  auto sourceFile =
-      new (ctx) SourceFile(*moduleDecl, SourceFileKind::Library, bufferID);
-  sourceFile->setImports({});
-
-  return memBufferStartLoc;
-}

lib/Sema/TypeCheckMacros.cpp

@@ -1367,13 +1367,6 @@ static SourceFile *evaluateAttachedMacro(MacroDecl *macro, Decl *attachedTo,
   // This is relevant for Swift macros inferred from Clang attributes,
   // since they don't have a source representation.
   SourceLoc attrLoc = attr->AtLoc;
-  if (attrLoc.isInvalid() &&
-      isa<ClangModuleUnit>(dc->getModuleScopeContext())) {
-    attrLoc = evaluateOrDefault(ctx.evaluator,
-                                PrettyPrintCustomAttrRequest{attr, attachedTo},
-                                SourceLoc());
-    assert(attrLoc);
-  }
 
   auto attrSourceFile = moduleDecl->getSourceFileContainingLocation(attrLoc);
   if (!attrSourceFile)