Fix address of static method

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -1896,9 +1896,18 @@ void Converter::EmitFnPtrCall(clang::Expr *callee) {
   StrCat(".unwrap()");
 }
 
+std::string Converter::GetFunctionRefName(const clang::FunctionDecl *fn_decl) {
+  if (auto *method = clang::dyn_cast<clang::CXXMethodDecl>(fn_decl);
+      method && method->isStatic()) {
+    return std::format("{}::{}", GetRecordName(method->getParent()),
+                       GetMethodName(method));
+  }
+  return Mapper::MapFunctionName(fn_decl);
+}
+
 void Converter::ConvertFunctionToFunctionPointer(
     const clang::FunctionDecl *fn_decl) {
-  StrCat(std::format("Some({})", Mapper::MapFunctionName(fn_decl)));
+  StrCat(std::format("Some({})", GetFunctionRefName(fn_decl)));
   computed_expr_type_ = ComputedExprType::FreshPointer;
 }
 
@@ -3015,8 +3024,7 @@ std::string Converter::ConvertDeclRefExpr(clang::DeclRefExpr *expr) {
   if (auto *function = decl->getAsFunction()) {
     if (auto method = clang::dyn_cast<clang::CXXMethodDecl>(function)) {
       if (method->isStatic()) {
-        return std::format("{}::{}", GetRecordName(method->getParent()),
-                           GetNamedDeclAsString(method));
+        return GetFunctionRefName(method);
       }
     }
     return GetNamedDeclAsString(function->getCanonicalDecl());

cpp2rust/converter/converter.h

@@ -314,6 +314,8 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
   virtual void
   ConvertFunctionToFunctionPointer(const clang::FunctionDecl *fn_decl);
 
+  std::string GetFunctionRefName(const clang::FunctionDecl *fn_decl);
+
   std::string ConvertFnPtrCallee(clang::Expr *arg);
   virtual std::string ConvertFnPtrPlaceholder(clang::Expr *arg);
 

cpp2rust/converter/models/converter_refcount.cpp

@@ -1352,7 +1352,7 @@ void ConverterRefCount::ConvertFunctionToFunctionPointer(
   StrCat(std::format("FnPtr::<{}>::new({})",
                      ConvertFunctionPointerType(
                          fn_decl->getType()->getAs<clang::FunctionProtoType>()),
-                     Mapper::MapFunctionName(fn_decl)));
+                     GetFunctionRefName(fn_decl)));
   computed_expr_type_ = ComputedExprType::FreshPointer;
 }
 

tests/unit/out/refcount/fn_ptr_struct.rs

@@ -76,15 +76,15 @@ pub fn main() {
 }
 fn main_0() -> i32 {
     let p1: Value<FnPtr<fn(i32) -> i32>> =
-        Rc::new(RefCell::new((FnPtr::<fn(i32) -> i32>::new(pick))));
+        Rc::new(RefCell::new((FnPtr::<fn(i32) -> i32>::new(S::pick_i32))));
     let p2: Value<FnPtr<fn(i32) -> i32>> =
-        Rc::new(RefCell::new(FnPtr::<fn(i32) -> i32>::new(solo)));
+        Rc::new(RefCell::new(FnPtr::<fn(i32) -> i32>::new(S::solo)));
     assert!((({ (*(*p1.borrow()))(5,) }) == 6));
     assert!((({ (*(*p2.borrow()))(5,) }) == 8));
-    assert!((({ S::pick(5_i64,) }) == 7));
+    assert!((({ S::pick_i64(5_i64,) }) == 7));
     let h3: Value<Handler> = Rc::new(RefCell::new(Handler {
         tag: Rc::new(RefCell::new(3)),
-        cb: Rc::new(RefCell::new((FnPtr::<fn(i32) -> i32>::new(pick)))),
+        cb: Rc::new(RefCell::new((FnPtr::<fn(i32) -> i32>::new(S::pick_i32)))),
     }));
     assert!((({ (*(*(*h3.borrow()).cb.borrow()))(1,) }) == 2));
     let h1: Value<Handler> = Rc::new(RefCell::new(Handler {

tests/unit/out/unsafe/fn_ptr_struct.rs

@@ -47,14 +47,14 @@ pub fn main() {
     }
 }
 unsafe fn main_0() -> i32 {
-    let mut p1: Option<unsafe fn(i32) -> i32> = (Some(pick));
-    let mut p2: Option<unsafe fn(i32) -> i32> = Some(solo);
+    let mut p1: Option<unsafe fn(i32) -> i32> = (Some(S::pick_i32));
+    let mut p2: Option<unsafe fn(i32) -> i32> = Some(S::solo);
     assert!(((unsafe { (p1).unwrap()(5,) }) == (6)));
     assert!(((unsafe { (p2).unwrap()(5,) }) == (8)));
-    assert!(((unsafe { S::pick(5_i64,) }) == (7)));
+    assert!(((unsafe { S::pick_i64(5_i64,) }) == (7)));
     let mut h3: Handler = Handler {
         tag: 3,
-        cb: (Some(pick)),
+        cb: (Some(S::pick_i32)),
     };
     assert!(((unsafe { (h3.cb).unwrap()(1,) }) == (2)));
     let mut h1: Handler = Handler {