Director virtual methods and std::move

Add missing std::move calls in director methods

Author: wsfulton

CHANGES.current

@@ -9,3 +9,5 @@ Version 4.5.0 (in progress)
 
 2025-10-27: wsfulton
             #3276 Add missing std::move when wrapping move constructors for directors.
+            Also add missing std::move for wrapped director (virtual) methods with
+            rvalue references.

Examples/test-suite/cpp11_directors.i

@@ -24,6 +24,14 @@ struct MoveOnlyNode {
   MoveOnlyNode(int a, double d) {}
   MoveOnlyNode() = default;
   virtual ~MoveOnlyNode() = default;
+  virtual void rvalues_int(int &&) {}
+  virtual void rvalues_mo(MoveOnlyNode &&) {}
+  virtual void rvalues_mo_overload(MoveOnlyNode &&) {}
+  virtual void rvalues_mo_overload(int, double, MoveOnlyNode &&) {}
+
+  using DoubleRVR = double&&;
+  using MoveOnlyNodeRVR = MoveOnlyNode&&;
+  virtual void rvalues_using(DoubleRVR, MoveOnlyNodeRVR p2) {}
 };
 }
 %}

Source/Modules/directors.cxx

@@ -101,27 +101,29 @@ String *Swig_director_declaration(Node *n) {
  * ----------------------------------------------------------------------------- */
 
 String *Swig_method_call(const_String_or_char_ptr name, ParmList *parms) {
-  String *func;
+  String *func = NewString("");
   int comma = 0;
   Parm *p = parms;
-  SwigType *pt;
-  String *nname;
-
-  func = NewString("");
-  nname = SwigType_namestr(name);
+  String *nname = SwigType_namestr(name);
   Printf(func, "%s(", nname);
+
   while (p) {
-    String *pname;
-    pt = Getattr(p, "type");
+    SwigType *pt = Getattr(p, "type");
     if ((SwigType_type(pt) != T_VOID)) {
+      SwigType *rpt = SwigType_typedef_resolve_all(pt);
+      String *pname = Getattr(p, "name");
       if (comma)
-	Printf(func, ",");
-      pname = Getattr(p, "name");
-      Printf(func, "%s", pname);
+	Append(func, ",");
+      if (SwigType_isrvalue_reference(rpt))
+	Printv(func, "std::move(", pname, ")", NIL);
+      else
+	Printv(func, pname, NIL);
+      Delete(rpt);
       comma = 1;
     }
     p = nextSibling(p);
   }
+
   Printf(func, ")");
   return func;
 }

Source/Swig/cwrap.c

@@ -397,16 +397,12 @@ String *Swig_cfunction_call(const_String_or_char_ptr name, ParmList *parms) {
       SwigType *rpt = SwigType_typedef_resolve_all(pt);
       String *pname = Swig_cparm_name(p, i);
       String *rcaststr = SwigType_rcaststr(rpt, pname);
-
-      if (comma) {
+      if (comma)
 	Append(func, ",");
-      }
-
       if (cparse_cplusplus && SwigType_type(rpt) == T_USER)
 	Printv(func, "SWIG_STD_MOVE(", rcaststr, ")", NIL);
       else
 	Printv(func, rcaststr, NIL);
-
       Delete(rpt);
       Delete(pname);
       Delete(rcaststr);