Add ShouldReplaceWithMappedBody

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -2033,8 +2033,7 @@ std::string Converter::ConvertDeclRefExpr(clang::DeclRefExpr *expr) {
   }
 
   auto *decl = expr->getDecl();
-  if (!(clang::isa<clang::FunctionDecl>(decl) && isAddrOf()) &&
-      Mapper::Contains(expr)) {
+  if (ShouldReplaceWithMappedBody(expr)) {
     return GetMappedAsString(expr);
   } else if (auto *function = decl->getAsFunction()) {
     if (auto method = clang::dyn_cast<clang::CXXMethodDecl>(function)) {
@@ -3430,6 +3429,13 @@ bool Converter::isCallee() const {
   return !curr_expr_kind_.empty() && curr_expr_kind_.back() == ExprKind::Callee;
 }
 
+bool Converter::ShouldReplaceWithMappedBody(clang::DeclRefExpr *expr) const {
+  if (clang::isa<clang::FunctionDecl>(expr->getDecl()) && isAddrOf()) {
+    return false;
+  }
+  return Mapper::Contains(expr);
+}
+
 void Converter::SetFresh() {
   switch (computed_expr_type_) {
   case ComputedExprType::Value:

cpp2rust/converter/converter.h

@@ -455,6 +455,8 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
 
   virtual bool RecordDerivesDefault(const clang::CXXRecordDecl *decl);
 
+  bool ShouldReplaceWithMappedBody(clang::DeclRefExpr *expr) const;
+
   std::string *rs_code_;
   clang::ASTContext &ctx_;
   clang::FunctionDecl *curr_function_ = nullptr;

cpp2rust/converter/models/converter_refcount.cpp

@@ -626,15 +626,14 @@ bool ConverterRefCount::VisitDeclRefExpr(clang::DeclRefExpr *expr) {
     }
   }
 
-  auto str = ConvertDeclRefExpr(expr);
-  auto decl = expr->getDecl();
-
-  if (!(clang::isa<clang::FunctionDecl>(decl) && isAddrOf()) &&
-      Mapper::Contains(expr)) {
+  if (ShouldReplaceWithMappedBody(expr)) {
     StrCat(GetMappedAsString(expr));
     return false;
   }
 
+  auto str = ConvertDeclRefExpr(expr);
+  auto decl = expr->getDecl();
+
   if (auto fn_decl = clang::dyn_cast<clang::FunctionDecl>(decl)) {
     if (isAddrOf()) {
       ConvertFunctionToFunctionPointer(fn_decl);