Move MethodsOnPtr in refcount

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -29,7 +29,6 @@ std::unordered_set<std::string> Converter::globals_;
 std::vector<std::string> Converter::global_inits_;
 std::unordered_set<std::string> Converter::abstract_structs_;
 Converter::RecordIndex Converter::record_decls_;
-std::map<std::string, Converter::MethodsOnPtr> Converter::methods_on_ptr_;
 std::map<std::string, Converter::DeferredBlock> Converter::vtable_impls_;
 
 void Converter::ConvertUniquePtrDeref(clang::CXXOperatorCallExpr *expr) {
@@ -75,13 +74,6 @@ void Converter::EmitVTableImpls(std::string &out) {
   }
 }
 
-void Converter::EmitMethodsOnPtr(std::string &out) {
-  for (const auto &[name, methods] : methods_on_ptr_) {
-    EmitDeferredBlock(methods.trait, out);
-    EmitDeferredBlock(methods.impl, out);
-  }
-}
-
 std::string Converter::ForceGlobalInit(const clang::VarDecl *decl) {
   return std::format("std::cell::LazyCell::force(&*&raw const {});",
                      GetNamedDeclAsString(decl));

cpp2rust/converter/converter.h

@@ -55,8 +55,6 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
   static void EmitOpaqueRecords(std::string &out);
   static void EmitGlobalInits(Model model, std::string &out);
 
-  static void EmitMethodsOnPtr(std::string &out);
-
   static void EmitVTableImpls(std::string &out);
 
   virtual bool VisitBuiltinType(clang::BuiltinType *type);
@@ -916,14 +914,6 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
     std::string header;
     std::string body;
   };
-  struct MethodsOnPtr {
-    DeferredBlock trait;
-    DeferredBlock impl;
-  };
-  // record name -> trait and impl for Ptr<record>, emitted after all
-  // translation units.
-  static std::map<std::string, MethodsOnPtr> methods_on_ptr_;
-
   static std::map<std::string, DeferredBlock> vtable_impls_;
 
   static void EmitDeferredBlock(const DeferredBlock &block,

cpp2rust/converter/models/converter_refcount.cpp

@@ -17,6 +17,16 @@
 #include "converter/mapper.h"
 
 namespace cpp2rust {
+std::map<std::string, ConverterRefCount::MethodsOnPtr>
+    ConverterRefCount::methods_on_ptr_;
+
+void ConverterRefCount::EmitMethodsOnPtr(std::string &out) {
+  for (const auto &[name, methods] : methods_on_ptr_) {
+    EmitDeferredBlock(methods.trait, out);
+    EmitDeferredBlock(methods.impl, out);
+  }
+}
+
 ConverterRefCount::ConverterRefCount(std::string &rs_code,
                                      clang::ASTContext &ctx)
     : Converter(rs_code, ctx, "", ""),
@@ -2879,7 +2889,7 @@ ConverterRefCount::TraitName(const clang::CXXRecordDecl *decl) const {
   return GetRecordName(decl) + "Impl";
 }
 
-Converter::MethodsOnPtr &
+ConverterRefCount::MethodsOnPtr &
 ConverterRefCount::MethodsOnPtrFor(const clang::CXXRecordDecl *decl) {
   auto name = GetRecordName(decl);
   auto [it, inserted] = methods_on_ptr_.try_emplace(name);

cpp2rust/converter/models/converter_refcount.h

@@ -12,6 +12,8 @@ class ConverterRefCount final : public Converter {
 
   void EmitFilePreamble() override;
 
+  static void EmitMethodsOnPtr(std::string &out);
+
   bool VisitRecordType(clang::RecordType *type) override;
 
   bool VisitConstantArrayType(clang::ConstantArrayType *type) override;
@@ -247,6 +249,15 @@ class ConverterRefCount final : public Converter {
 
   std::string TraitName(const clang::CXXRecordDecl *decl) const;
 
+  struct MethodsOnPtr {
+    DeferredBlock trait;
+    DeferredBlock impl;
+  };
+
+  // record name -> trait and impl for Ptr<record>, emitted after all
+  // translation units.
+  static std::map<std::string, MethodsOnPtr> methods_on_ptr_;
+
   MethodsOnPtr &MethodsOnPtrFor(const clang::CXXRecordDecl *decl);
 
   std::string DestroyMembers(const clang::CXXRecordDecl *decl) override;

cpp2rust/cpp2rust_lib.cpp

@@ -11,6 +11,7 @@
 
 #include "compat/platform_flags.h"
 #include "converter/converter.h"
+#include "converter/models/converter_refcount.h"
 #include "frontend_action.h"
 
 namespace cpp2rust {
@@ -32,7 +33,9 @@ std::string TranspileSrc(std::string_view cc_code, Model model,
       filename.ends_with(".c") ? CLANG_C_COMPILER : CLANG_CXX_COMPILER);
   Converter::EmitOpaqueRecords(rs_code);
   Converter::EmitVTableImpls(rs_code);
-  Converter::EmitMethodsOnPtr(rs_code);
+  if (model == Model::kRefCount) {
+    ConverterRefCount::EmitMethodsOnPtr(rs_code);
+  }
   Converter::EmitGlobalInits(model, rs_code);
   return rs_code;
 }
@@ -75,7 +78,9 @@ std::string TranspileDir(std::string_view build_dir, Model model,
   Tool.run(&factory);
   Converter::EmitOpaqueRecords(rs_code);
   Converter::EmitVTableImpls(rs_code);
-  Converter::EmitMethodsOnPtr(rs_code);
+  if (model == Model::kRefCount) {
+    ConverterRefCount::EmitMethodsOnPtr(rs_code);
+  }
   Converter::EmitGlobalInits(model, rs_code);
   return rs_code;
 }