Merge pull request #41214 from zoecarver/re-enable-method-tests

[cxx-interop] Re-enable some method tests.

Author: zoecarver

test/Interop/Cxx/class/method/methods.swift

@@ -31,20 +31,19 @@ CxxMethodTestSuite.test("(Int, Int) -> Int") {
   expectEqual(42, instance.constSum(40, 2))
 }
 
-// This causes a crash: rdar://88354445
-// CxxMethodTestSuite.test("(NonTrivialInWrapper, NonTrivialInWrapper) -> Int") {
-//   var instance = HasMethods()
-//
-//   expectEqual(42, instance.nonConstSum(NonTrivialInWrapper(value: 40), NonTrivialInWrapper(value: 2)))
-//   expectEqual(42, instance.constSum(NonTrivialInWrapper(value: 40), NonTrivialInWrapper(value: 2)))
-// }
-//
-// CxxMethodTestSuite.test("(NonTrivialInWrapper, NonTrivialInWrapper) -> NonTrivialInWrapper") {
-//   var instance = HasMethods()
-//
-//   expectEqual(42, instance.nonConstSumAsWrapper(NonTrivialInWrapper(value: 40), NonTrivialInWrapper(value: 2)).value)
-//   expectEqual(42, instance.constSumAsWrapper(NonTrivialInWrapper(value: 40), NonTrivialInWrapper(value: 2)).value)
-// }
+CxxMethodTestSuite.test("(NonTrivialInWrapper, NonTrivialInWrapper) -> Int") {
+  var instance = HasMethods()
+
+  expectEqual(42, instance.nonConstSum(NonTrivialInWrapper(value: 40), NonTrivialInWrapper(value: 2)))
+  expectEqual(42, instance.constSum(NonTrivialInWrapper(value: 40), NonTrivialInWrapper(value: 2)))
+}
+
+CxxMethodTestSuite.test("(NonTrivialInWrapper, NonTrivialInWrapper) -> NonTrivialInWrapper") {
+  var instance = HasMethods()
+
+  expectEqual(42, instance.nonConstSumAsWrapper(NonTrivialInWrapper(value: 40), NonTrivialInWrapper(value: 2)).value)
+  expectEqual(42, instance.constSumAsWrapper(NonTrivialInWrapper(value: 40), NonTrivialInWrapper(value: 2)).value)
+}
 
 CxxMethodTestSuite.test("(Int) -> NonTrivialInWrapper") {
   var instance = HasMethods()