Swift: deduplicate accessors and params correctly

Author: redsun82

swift/extractor/mangler/SwiftMangler.cpp

@@ -65,16 +65,17 @@ SwiftMangledName SwiftMangler::visitValueDecl(const swift::ValueDecl* decl, bool
   auto ret = initMangled(decl);
   std::string name;
   llvm::raw_string_ostream oss{name};
-  decl->getName().print(oss);
+  oss << decl->getName();
   ret << name;
   if (decl->isStatic()) {
     ret << "|static";
   }
   return ret;
 }
 
-SwiftMangledName SwiftMangler::visitTypeDiscriminatedValueDecl(const swift::ValueDecl* decl) {
-  if (auto ret = visitValueDecl(decl)) {
+SwiftMangledName SwiftMangler::visitTypeDiscriminatedValueDecl(const swift::ValueDecl* decl,
+                                                               bool force) {
+  if (auto ret = visitValueDecl(decl, force)) {
     ret << fetch(decl->getInterfaceType()->getCanonicalType());
     return ret;
   }
@@ -85,6 +86,13 @@ SwiftMangledName SwiftMangler::visitAbstractFunctionDecl(const swift::AbstractFu
   return visitTypeDiscriminatedValueDecl(decl);
 }
 
+SwiftMangledName SwiftMangler::visitAccessorDecl(const swift::AccessorDecl* decl) {
+  std::string name;
+  llvm::raw_string_ostream oss{name};
+  decl->printUserFacingName(oss);
+  return visitTypeDiscriminatedValueDecl(decl, /*force=*/true) << '_' << name;
+}
+
 SwiftMangledName SwiftMangler::visitSubscriptDecl(const swift::SubscriptDecl* decl) {
   return visitTypeDiscriminatedValueDecl(decl);
 }
@@ -93,6 +101,10 @@ SwiftMangledName SwiftMangler::visitVarDecl(const swift::VarDecl* decl) {
   return visitTypeDiscriminatedValueDecl(decl);
 }
 
+SwiftMangledName SwiftMangler::visitParamDecl(const swift::ParamDecl* decl) {
+  return visitTypeDiscriminatedValueDecl(decl, /*force=*/true);
+}
+
 SwiftMangledName SwiftMangler::visitExtensionDecl(const swift::ExtensionDecl* decl) {
   if (decl->getDeclContext()->isLocalContext()) {
     return {};

swift/extractor/mangler/SwiftMangler.h

@@ -58,8 +58,10 @@ class SwiftMangler : private swift::TypeVisitor<SwiftMangler, SwiftMangledName>,
   SwiftMangledName visitModuleDecl(const swift::ModuleDecl* decl);
   SwiftMangledName visitExtensionDecl(const swift::ExtensionDecl* decl);
   SwiftMangledName visitAbstractFunctionDecl(const swift::AbstractFunctionDecl* decl);
+  SwiftMangledName visitAccessorDecl(const swift::AccessorDecl* decl);
   SwiftMangledName visitSubscriptDecl(const swift::SubscriptDecl* decl);
   SwiftMangledName visitVarDecl(const swift::VarDecl* decl);
+  SwiftMangledName visitParamDecl(const swift::ParamDecl* decl);
   SwiftMangledName visitAbstractTypeParamDecl(const swift::AbstractTypeParamDecl* decl);
   SwiftMangledName visitGenericTypeParamDecl(const swift::GenericTypeParamDecl* decl);
 
@@ -111,7 +113,8 @@ class SwiftMangler : private swift::TypeVisitor<SwiftMangler, SwiftMangledName>,
   unsigned int getExtensionIndex(const swift::ExtensionDecl* decl, const swift::Decl* parent);
   static SwiftMangledName initMangled(const swift::TypeBase* type);
   SwiftMangledName initMangled(const swift::Decl* decl);
-  SwiftMangledName visitTypeDiscriminatedValueDecl(const swift::ValueDecl* decl);
+  SwiftMangledName visitTypeDiscriminatedValueDecl(const swift::ValueDecl* decl,
+                                                   bool force = false);
 };
 
 // This implementation is indented for use in defining trap keys. In this case fetching gives