[AST] Rename mangleDeclAsUSR -> mangleDeclWithPrefix

This is used by other things that don't necessarily want an IDE
USR.

Author: hamishknight

include/swift/AST/ASTMangler.h

@@ -399,7 +399,7 @@ class ASTMangler : public Mangler {
 
   void appendAnyDecl(const ValueDecl *Decl);
   std::string mangleAnyDecl(const ValueDecl *decl, bool addPrefix);
-  std::string mangleDeclAsUSR(const ValueDecl *Decl, StringRef USRPrefix);
+  std::string mangleDeclWithPrefix(const ValueDecl *decl, StringRef prefix);
 
   std::string mangleAccessorEntityAsUSR(AccessorKind kind,
                                         const AbstractStorageDecl *decl,

lib/AST/ASTMangler.cpp

@@ -1011,10 +1011,9 @@ std::string ASTMangler::mangleAnyDecl(const ValueDecl *decl, bool addPrefix) {
   return finalize();
 }
 
-std::string ASTMangler::mangleDeclAsUSR(const ValueDecl *Decl,
-                                        StringRef USRPrefix) {
-  return (llvm::Twine(USRPrefix) + mangleAnyDecl(Decl, /*addPrefix*/ false))
-      .str();
+std::string ASTMangler::mangleDeclWithPrefix(const ValueDecl *decl,
+                                             StringRef prefix) {
+  return (llvm::Twine(prefix) + mangleAnyDecl(decl, /*addPrefix*/ false)).str();
 }
 
 std::string ASTMangler::mangleAccessorEntityAsUSR(AccessorKind kind,

lib/AST/USRGeneration.cpp

@@ -248,7 +248,7 @@ swift::SwiftUSRGenerationRequest::evaluate(Evaluator &evaluator,
 
   using namespace Mangle;
   ASTMangler NewMangler = ASTMangler::forUSR(D->getASTContext());
-  return NewMangler.mangleDeclAsUSR(D, getUSRSpacePrefix());
+  return NewMangler.mangleDeclWithPrefix(D, getUSRSpacePrefix());
 }
 
 std::string

lib/ClangImporter/SwiftDeclSynthesizer.cpp

@@ -998,7 +998,7 @@ getAccessorDeclarationName(clang::ASTContext &Ctx, NominalTypeDecl *structDecl,
   std::string id;
   llvm::raw_string_ostream IdStream(id);
   Mangle::ASTMangler mangler(structDecl->getASTContext());
-  IdStream << "$" << mangler.mangleDeclAsUSR(structDecl, "") << "$"
+  IdStream << "$" << mangler.mangleDeclWithPrefix(structDecl, "") << "$"
            << fieldDecl->getName() << "$" << suffix;
 
   return clang::DeclarationName(&Ctx.Idents.get(IdStream.str()));

lib/Serialization/ModuleFile.cpp

@@ -753,7 +753,7 @@ void ModuleFile::loadDerivativeFunctionConfigurations(
     return;
   auto &ctx = originalAFD->getASTContext();
   Mangle::ASTMangler Mangler(ctx);
-  auto mangledName = Mangler.mangleDeclAsUSR(originalAFD, "");
+  auto mangledName = Mangler.mangleDeclWithPrefix(originalAFD, "");
   auto configs = Core->DerivativeFunctionConfigurations->find(mangledName);
   if (configs == Core->DerivativeFunctionConfigurations->end())
     return;

lib/Serialization/Serialization.cpp

@@ -6897,14 +6897,15 @@ static void recordDerivativeFunctionConfig(
   auto &ctx = AFD->getASTContext();
   Mangle::ASTMangler Mangler(AFD->getASTContext());
   for (auto *attr : AFD->getAttrs().getAttributes<DifferentiableAttr>()) {
-    auto mangledName = ctx.getIdentifier(Mangler.mangleDeclAsUSR(AFD, ""));
+    auto mangledName = ctx.getIdentifier(Mangler.mangleDeclWithPrefix(AFD, ""));
     derivativeConfigs[mangledName].insert(
         {ctx.getIdentifier(attr->getParameterIndices()->getString()),
          attr->getDerivativeGenericSignature()});
   }
   for (auto *attr : AFD->getAttrs().getAttributes<DerivativeAttr>()) {
     auto *origAFD = attr->getOriginalFunction(ctx);
-    auto mangledName = ctx.getIdentifier(Mangler.mangleDeclAsUSR(origAFD, ""));
+    auto mangledName =
+        ctx.getIdentifier(Mangler.mangleDeclWithPrefix(origAFD, ""));
     derivativeConfigs[mangledName].insert(
         {ctx.getIdentifier(attr->getParameterIndices()->getString()),
          AFD->getGenericSignature()});