Merge pull request #70420 from hyp/eng/virtual-methods++

[cxx-interop] virtual method fixes

Author: hyp

lib/ClangImporter/ImportDecl.cpp

@@ -42,6 +42,7 @@
 #include "swift/Basic/PrettyStackTrace.h"
 #include "swift/Basic/Statistic.h"
 #include "swift/Basic/StringExtras.h"
+#include "swift/Basic/Version.h"
 #include "swift/ClangImporter/CXXMethodBridging.h"
 #include "swift/ClangImporter/ClangImporterRequests.h"
 #include "swift/ClangImporter/ClangModule.h"
@@ -3747,33 +3748,39 @@ namespace {
     Decl *VisitCXXMethodDecl(const clang::CXXMethodDecl *decl) {
       auto method = VisitFunctionDecl(decl);
       if (decl->isVirtual() && isa_and_nonnull<ValueDecl>(method)) {
-
-        if (auto dc = method->getDeclContext();
-            !decl->isPure() &&
-            isa_and_nonnull<NominalTypeDecl>(dc->getAsDecl())) {
-
-          // generates the __synthesizedVirtualCall_ C++ thunk
-          clang::CXXMethodDecl *cxxThunk = synthesizeCxxVirtualMethod(
-              *static_cast<ClangImporter *>(
-                  dc->getASTContext().getClangModuleLoader()),
-              decl->getParent(), decl->getParent(), decl);
-
-          // call the __synthesizedVirtualCall_ C++ thunk from a Swift thunk
-          if (Decl *swiftThunk =
-                  cxxThunk ? VisitCXXMethodDecl(cxxThunk) : nullptr;
-              isa_and_nonnull<FuncDecl>(swiftThunk)) {
-            // synthesize the body of the Swift method to call the swiftThunk
-            synthesizeForwardingThunkBody(cast<FuncDecl>(method),
-                                          cast<FuncDecl>(swiftThunk));
-            return method;
+        if (Impl.isCxxInteropCompatVersionAtLeast(
+                version::getUpcomingCxxInteropCompatVersion())) {
+          if (auto dc = method->getDeclContext();
+              !decl->isPure() &&
+              isa_and_nonnull<NominalTypeDecl>(dc->getAsDecl())) {
+
+            // generates the __synthesizedVirtualCall_ C++ thunk
+            clang::CXXMethodDecl *cxxThunk = synthesizeCxxVirtualMethod(
+                *static_cast<ClangImporter *>(
+                    dc->getASTContext().getClangModuleLoader()),
+                decl->getParent(), decl->getParent(), decl);
+
+            // call the __synthesizedVirtualCall_ C++ thunk from a Swift thunk
+            if (Decl *swiftThunk =
+                    cxxThunk ? VisitCXXMethodDecl(cxxThunk) : nullptr;
+                isa_and_nonnull<FuncDecl>(swiftThunk)) {
+              // synthesize the body of the Swift method to call the swiftThunk
+              synthesizeForwardingThunkBody(cast<FuncDecl>(method),
+                                            cast<FuncDecl>(swiftThunk));
+              return method;
+            }
           }
-        }
 
-        Impl.markUnavailable(
-            cast<ValueDecl>(method),
-            decl->isPure() ?
-            "virtual function is not available in Swift because it is pure" :
-            "virtual function is not available in Swift");
+          Impl.markUnavailable(
+              cast<ValueDecl>(method),
+              decl->isPure() ? "virtual function is not available in Swift "
+                               "because it is pure"
+                             : "virtual function is not available in Swift");
+        } else {
+          Impl.markUnavailable(
+              cast<ValueDecl>(method),
+              "virtual functions are not yet available in Swift");
+        }
       }
 
       if (Impl.SwiftContext.LangOpts.CxxInteropGettersSettersAsProperties ||

test/Interop/Cxx/class/inheritance/virtual-methods-irgen.swift

@@ -1,7 +1,4 @@
-// RUN: %target-swift-emit-ir -I %S/Inputs -enable-experimental-cxx-interop %s -validate-tbd-against-ir=none | %FileCheck %s
-
-// FIXME: enable on Windows
-// XFAIL: OS=windows-msvc
+// RUN: %target-swift-emit-ir -I %S/Inputs -cxx-interoperability-mode=upcoming-swift %s -validate-tbd-against-ir=none -Xcc -fignore-exceptions | %FileCheck %s
 
 import VirtualMethods
 
@@ -18,18 +15,18 @@ d2.f()
 d3.f()
 d4.f()
 
-// CHECK: invoke {{.*}} @_ZN5Base31fEv
-// CHECK: invoke {{.*}} @_ZN8Derived21fEv
-// CHECK: invoke {{.*}} @_ZN8Derived31fEv
+// CHECK: call {{.*}} @{{_ZN5Base31fEv|"\?f@Base3@@UEAAHXZ"}}
+// CHECK: call {{.*}} @{{_ZN8Derived21fEv|"\?f@Derived2@@UEAAHXZ"}}
+// CHECK: call {{.*}} @{{_ZN8Derived31fEv|"\?f@Derived3@@UEAAHXZ"}}
 // CHECK: call swiftcc {{.*}} @"$sSo8Derived4V1fs5Int32VyF"
 
 // CHECK: define {{.*}} @"$sSo8Derived4V1fs5Int32VyF"(ptr swiftself dereferenceable
-// CHECK: invoke {{.*}}  @_ZN8Derived423__synthesizedBaseCall_fEv
+// CHECK: call {{.*}}  @{{_ZN8Derived423__synthesizedBaseCall_fEv|"\?__synthesizedBaseCall_f@Derived4@@QEAAHXZ"}}
 
-// CHECK: define {{.*}}void @{{_ZN7DerivedIiE3fooEv|"\?foo@\?$Derived@H@@UEAAXXZ"}}
+// CHECK: define {{.*}}void @{{_ZN7DerivedIiE3fooEv|"\?foo@\?\$Derived@H@@UEAAXXZ"}}
 // CHECK:   call void @{{_Z21testFunctionCollectedv|"\?testFunctionCollected@@YAXXZ"}}
 
 // CHECK: define {{.*}}void @{{_Z21testFunctionCollectedv|"\?testFunctionCollected@@YAXXZ"}}
 
 // CHECK-NOT: _ZN6UnusedIiE3fooEv
-// CHECK-NOT: "\?foo@\?$Unused@H@@UEAAXXZ"
+// CHECK-NOT: "\?foo@\?\$Unused@H@@UEAAXXZ"

test/Interop/Cxx/class/inheritance/virtual-methods-module-interface.swift

@@ -1,4 +1,4 @@
-// RUN: %target-swift-ide-test -print-module -print-implicit-attrs -module-to-print=VirtualMethods -I %S/Inputs -source-filename=x -enable-experimental-cxx-interop | %FileCheck %s
+// RUN: %target-swift-ide-test -print-module -cxx-interoperability-mode=upcoming-swift -print-implicit-attrs -module-to-print=VirtualMethods -I %S/Inputs -source-filename=x | %FileCheck %s
 
 // CHECK: struct Base {
 // CHECK-NEXT:  init()

test/Interop/Cxx/class/inheritance/virtual-methods-typechecker.swift

@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -I %S/Inputs -enable-experimental-cxx-interop
+// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -I %S/Inputs -cxx-interoperability-mode=upcoming-swift
 
 import VirtualMethods