Merge pull request #83453 from swiftlang/fix-rvalue-ref-virtual

[cxx-interop] Fix import virtual methods with rvalue ref params

Author: Xazax-hun

lib/ClangImporter/SwiftDeclSynthesizer.cpp

@@ -2176,11 +2176,18 @@ clang::CXXMethodDecl *SwiftDeclSynthesizer::synthesizeCXXForwardingMethod(
   for (size_t i = 0; i < newMethod->getNumParams(); ++i) {
     auto *param = newMethod->getParamDecl(i);
     auto type = param->getType();
-    if (type->isReferenceType())
-      type = type->getPointeeType();
-    args.push_back(new (clangCtx) clang::DeclRefExpr(
-        clangCtx, param, false, type, clang::ExprValueKind::VK_LValue,
-        clang::SourceLocation()));
+    clang::Expr *argExpr = new (clangCtx) clang::DeclRefExpr(
+        clangCtx, param, false, type.getNonReferenceType(),
+        clang::ExprValueKind::VK_LValue, clang::SourceLocation());
+    if (type->isRValueReferenceType()) {
+      argExpr = clangSema
+                    .BuildCXXNamedCast(
+                        clang::SourceLocation(), clang::tok::kw_static_cast,
+                        clangCtx.getTrivialTypeSourceInfo(type), argExpr,
+                        clang::SourceRange(), clang::SourceRange())
+                    .get();
+    }
+    args.push_back(argExpr);
   }
   auto memberCall = clangSema.BuildCallExpr(
       nullptr, memberExpr, clang::SourceLocation(), args,

test/Interop/Cxx/foreign-reference/Inputs/module.modulemap

@@ -67,3 +67,8 @@ module Printed {
   header "printed.h"
   requires cplusplus
 }
+
+module VirtMethodWithRvalRef {
+  header "virtual-methods-with-rvalue-reference.h"
+  requires cplusplus
+}

test/Interop/Cxx/foreign-reference/Inputs/virtual-methods-with-rvalue-reference.h

@@ -0,0 +1,22 @@
+#pragma once
+
+#include "swift/bridging"
+
+class CxxForeignRef;
+
+void retain(CxxForeignRef * obj);
+void release(CxxForeignRef * obj);
+
+struct NonTrivial {
+  NonTrivial(const NonTrivial &other);
+  ~NonTrivial();
+};
+
+class CxxForeignRef {
+public:
+  CxxForeignRef(const CxxForeignRef &) = delete;
+  CxxForeignRef() = default;
+
+  virtual void takesRValRef(NonTrivial &&);
+} SWIFT_SHARED_REFERENCE(retain, release);
+

test/Interop/Cxx/foreign-reference/reference-in-virtual-methods.swift

@@ -0,0 +1,7 @@
+// RUN: %target-swift-frontend -typecheck -verify -I %S/Inputs -I %swift_src_root/lib/ClangImporter/SwiftBridging %s -cxx-interoperability-mode=default -disable-availability-checking
+
+import VirtMethodWithRvalRef
+
+func f(_ x: CxxForeignRef, _ y: NonTrivial) {
+    x.takesRValRef(consuming: y)
+}