Fix overloaded names in unsafe vs refcount

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -4122,10 +4122,7 @@ Converter::GetOverloadedFunctionName(const clang::FunctionDecl *decl) {
   }
 
   for (auto *parameter : decl->parameters()) {
-    name += GetUnsafeTypeAsString(parameter->getType());
-    if (parameter->getType()->isRValueReferenceType()) {
-      name += "_rv";
-    }
+    name += GetOverloadParamTypeAsString(parameter->getType());
     name += '_';
   }
 
@@ -4223,6 +4220,18 @@ std::string Converter::GetUnsafeTypeAsString(clang::QualType qual_type) const {
   return std::string(Trim(type_as_string));
 }
 
+std::string
+Converter::GetOverloadParamTypeAsString(clang::QualType type) const {
+  auto str = GetUnsafeTypeAsString(type);
+  if (type->isVoidPointerType() && type->getPointeeType().isConstQualified()) {
+    str += "_const";
+  }
+  if (type->isRValueReferenceType()) {
+    name += "_rv";
+  }
+  return str;
+}
+
 void Converter::ConvertVarInit(clang::QualType qual_type, clang::Expr *expr) {
   if (qual_type->isReferenceType() && !IsReferenceType(expr)) {
     if (llvm::isa<clang::MaterializeTemporaryExpr>(expr->IgnoreImpCasts())) {

cpp2rust/converter/converter.h

@@ -588,6 +588,7 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
   GetStructAttributes(const clang::RecordDecl *decl);
 
   virtual std::string GetUnsafeTypeAsString(clang::QualType qual_type) const;
+  virtual std::string GetOverloadParamTypeAsString(clang::QualType type) const;
 
   virtual bool NeedsMut(const clang::VarDecl *decl, clang::QualType type,
                         llvm::StringRef name) const;

cpp2rust/converter/models/converter_refcount.cpp

@@ -133,6 +133,19 @@ ConverterRefCount::GetSafeTypeAsString(clang::QualType qual_type) const {
   return std::string(Trim(type_as_string));
 }
 
+std::string
+ConverterRefCount::GetOverloadParamTypeAsString(clang::QualType type) const {
+  auto str = GetSafeTypeAsString(type);
+  if ((type->isPointerType() || type->isReferenceType()) &&
+      type->getPointeeType().isConstQualified()) {
+    str += "_const";
+  }
+  if (type->isRValueReferenceType()) {
+    name += "_rv";
+  }
+  return str;
+}
+
 bool ConverterRefCount::NeedsMut(const clang::VarDecl *decl,
                                  clang::QualType type,
                                  llvm::StringRef /*name*/) const {

cpp2rust/converter/models/converter_refcount.h

@@ -329,6 +329,8 @@ class ConverterRefCount final : public Converter {
   std::string ConvertSubscriptIndex(clang::Expr *idx);
 
   std::string GetSafeTypeAsString(clang::QualType qual_type) const;
+  std::string
+  GetOverloadParamTypeAsString(clang::QualType type) const override;
 
   bool NeedsMut(const clang::VarDecl *decl, clang::QualType type,
                 llvm::StringRef /*name*/) const override;