Merge pull request #60448 from hyp/eng/resilient++

[interop][SwiftToCxx] ensure that resilient class values are supported

Author: hyp

lib/PrintAsClang/PrintClangFunction.cpp

@@ -347,7 +347,8 @@ void DeclAndTypeClangFunctionPrinter::printFunctionSignature(
   bool isIndirectReturnType =
       kind == FunctionSignatureKind::CFunctionProto &&
       !isKnownCType(resultTy, typeMapping) &&
-      (isResilientType(resultTy) || isGenericType(resultTy) ||
+      ((isResilientType(resultTy) && !resultTy->isAnyClassReferenceType()) ||
+       isGenericType(resultTy) ||
        interopContext.getIrABIDetails().shouldReturnIndirectly(resultTy));
   if (!isIndirectReturnType) {
     OptionalTypeKind retKind;

test/Interop/SwiftToCxx/class/swift-class-execution.cpp

@@ -8,6 +8,16 @@
 // RUN: %target-codesign %t/swift-class-execution
 // RUN: %target-run %t/swift-class-execution | %FileCheck %s
 
+// RUN: %empty-directory(%t-evo)
+
+// RUN: %target-swift-frontend %S/swift-class-in-cxx.swift -typecheck -module-name Class -clang-header-expose-public-decls -enable-library-evolution -emit-clang-header-path %t-evo/class.h
+
+// RUN: %target-interop-build-clangxx -c %s -I %t-evo -o %t-evo/swift-class-execution.o
+// RUN: %target-interop-build-swift %S/swift-class-in-cxx.swift -o %t-evo/swift-class-execution-evo -Xlinker %t-evo/swift-class-execution.o -module-name Class -enable-library-evolution -Xfrontend -entry-point-function-name -Xfrontend swiftMain
+
+// RUN: %target-codesign %t-evo/swift-class-execution-evo
+// RUN: %target-run %t-evo/swift-class-execution-evo | %FileCheck %s
+
 // REQUIRES: executable_test
 
 #include <assert.h>

test/Interop/SwiftToCxx/class/swift-class-in-cxx.swift

@@ -4,6 +4,11 @@
 
 // RUN: %check-interop-cxx-header-in-clang(%t/class.h)
 
+// RUN: %target-swift-frontend %s -typecheck -module-name Class -enable-library-evolution -clang-header-expose-public-decls -emit-clang-header-path %t/class-evo.h
+// RUN: %FileCheck %s < %t/class-evo.h
+
+// RUN: %check-interop-cxx-header-in-clang(%t/class-evo.h)
+
 public final class ClassWithIntField {
   var field: Int64
 

test/Interop/SwiftToCxx/class/swift-class-inheritance-execution.cpp

@@ -11,6 +11,16 @@
 // RUN: not %target-interop-build-clangxx -c %s -I %t -o %t/swift-class-execution.o -DERROR1
 // RUN: not %target-interop-build-clangxx -c %s -I %t -o %t/swift-class-execution.o -DERROR2
 
+// RUN: %empty-directory(%t-evo)
+
+// RUN: %target-swift-frontend %S/swift-class-inheritance-in-cxx.swift -typecheck -module-name Class -enable-library-evolution -clang-header-expose-public-decls -emit-clang-header-path %t-evo/class.h
+
+// RUN: %target-interop-build-clangxx -c %s -I %t-evo -o %t-evo/swift-class-execution.o
+// RUN: %target-interop-build-swift %S/swift-class-inheritance-in-cxx.swift -o %t-evo/swift-class-execution-evo -Xlinker %t-evo/swift-class-execution.o -module-name Class -enable-library-evolution -Xfrontend -entry-point-function-name -Xfrontend swiftMain
+
+// RUN: %target-codesign %t-evo/swift-class-execution-evo
+// RUN: %target-run %t-evo/swift-class-execution-evo | %FileCheck %s
+
 // REQUIRES: executable_test
 
 #include <assert.h>

test/Interop/SwiftToCxx/class/swift-class-inheritance-in-cxx.swift

@@ -4,6 +4,11 @@
 
 // RUN: %check-interop-cxx-header-in-clang(%t/class.h)
 
+// RUN: %target-swift-frontend %s -typecheck -module-name Class -enable-library-evolution -clang-header-expose-public-decls -emit-clang-header-path %t/class-evo.h
+// RUN: %FileCheck %s < %t/class-evo.h
+
+// RUN: %check-interop-cxx-header-in-clang(%t/class-evo.h)
+
 public class BaseClass {
   var field: Int64
 

test/Interop/SwiftToCxx/structs/resilient-struct-in-cxx-execution.cpp

@@ -40,6 +40,11 @@ int main() {
 // CHECK: find - small dump
 // CURRENT-NEXT: x = 66
 // CHANGE-NEXT: x&y = 0&65
+  copySmallStruct.mutate();
+  copySmallStruct.dump();
+// CHECK: find - small dump
+// CURRENT-NEXT: x = 132
+// CHANGE-NEXT: x&y = 0&4294967230
 
   printSmallAndLarge(smallStruct, largeStruct);
 // CHECK: find - small dump

test/Interop/SwiftToCxx/structs/resilient-struct-in-cxx.swift

@@ -16,6 +16,13 @@ public struct FirstSmallStruct {
         print("x&y = \(x)&\(y)")
 #else
         print("x = \(x)")
+#endif
+    }
+
+    public mutating func mutate() {
+        x = x * 2
+#if CHANGE_LAYOUT
+        y = ~y
 #endif
     }
 }
@@ -61,6 +68,9 @@ public struct FirstSmallStruct {
 // CHECK-NEXT: inline void FirstSmallStruct::dump() const {
 // CHECK-NEXT:   return _impl::$s7Structs16FirstSmallStructV4dumpyyF(_getOpaquePointer());
 // CHECK-NEXT: }
+// CHECK-NEXT: inline void FirstSmallStruct::mutate() {
+// CHECK-NEXT:   return _impl::$s7Structs16FirstSmallStructV6mutateyyF(_getOpaquePointer());
+// CHECK-NEXT: }
 
 @frozen public struct FrozenStruct {
     private let storedInt: Int32