[SwiftToCxx] Creating new test case and fixing namespace

Author: Robertorosmaninho

lib/PrintAsClang/PrintClangFunction.cpp

@@ -695,7 +695,7 @@ void DeclAndTypeClangFunctionPrinter::printCxxThunkBody(
   // Create the condition and the statement to throw an exception.
   if (hasThrows) {
     os << "  if (opaqueError != nullptr)\n";
-    os << "    throw (swift::_impl::swift::Error(opaqueError));\n";
+    os << "    throw (swift::Error(opaqueError));\n";
   }
 
   // Return the function result value if it doesn't throw.

stdlib/public/SwiftShims/_SwiftCxxInteroperability.h

@@ -32,10 +32,6 @@ extern "C" void *_Nonnull swift_retain(void *_Nonnull) noexcept;
 
 extern "C" void swift_release(void *_Nonnull) noexcept;
 
-extern "C" void *_Nonnull swift_errorRetain(void *_Nonnull swiftError) noexcept;
-
-extern "C" void swift_errorRelease(void *_Nonnull swiftError) noexcept;
-
 inline void *_Nonnull opaqueAlloc(size_t size, size_t align) noexcept {
 #if defined(_WIN32)
   void *r = _aligned_malloc(size, align);
@@ -176,7 +172,12 @@ template <class T> inline void *_Nonnull getOpaquePointer(T &value) {
   return reinterpret_cast<void *>(&value);
 }
 
-namespace swift {
+} // namespace _impl
+
+extern "C" void *_Nonnull swift_errorRetain(void *_Nonnull swiftError) noexcept;
+
+extern "C" void swift_errorRelease(void *_Nonnull swiftError) noexcept;
+
 class Error {
 public:
   Error() {}
@@ -198,9 +199,6 @@ class Error {
 private:
   void * _Nonnull opaqueValue = nullptr;
 };
-}
-
-} // namespace _impl
 
 #pragma clang diagnostic pop
 

test/Interop/SwiftToCxx/functions/swift-functions-errors-execution.cpp

@@ -21,19 +21,22 @@ int main() {
 
   try {
     Functions::emptyThrowFunction();
-  } catch (swift::_impl::swift::Error& e) {
+  } catch (swift::Error& e) {
     printf("Exception\n");
   }
   try {
     Functions::throwFunction();
-  } catch (swift::_impl::swift::Error& e) {
+  } catch (swift::Error& e) {
      printf("Exception\n");
   }
   try {
     Functions::throwFunctionWithReturn();
-  } catch (swift::_impl::swift::Error& e) {
+  } catch (swift::Error& e) {
      printf("Exception\n");
   }
+  try {
+    Functions::testDestroyedError();
+  } catch(const swift::Error &e) { }
 
   return 0;
 }
@@ -43,3 +46,4 @@ int main() {
 // CHECK-NEXT: Exception
 // CHECK-NEXT: passThrowFunctionWithReturn
 // CHECK-NEXT: Exception
+// CHECK-NEXT: Test destroyed

test/Interop/SwiftToCxx/functions/swift-functions-errors.swift

@@ -25,7 +25,27 @@ public func emptyThrowFunction() throws { print("passEmptyThrowFunction") }
 // CHECK: void* self = nullptr;
 // CHECK: _impl::$s9Functions18emptyThrowFunctionyyKF(self, &opaqueError);
 // CHECK: if (opaqueError != nullptr)
-// CHECK: throw (swift::_impl::swift::Error(opaqueError))
+// CHECK: throw (swift::Error(opaqueError))
+// CHECK: }
+
+class TestDestroyed {
+  deinit {
+    print("Test destroyed")
+  }
+}
+
+public struct DestroyedError : Error {
+  let t = TestDestroyed()
+}
+
+public func testDestroyedError() throws { throw DestroyedError() }
+
+// CHECK: inline void testDestroyedError() {
+// CHECK: void* opaqueError = nullptr;
+// CHECK: void* self = nullptr;
+// CHECK: _impl::$s9Functions18testDestroyedErroryyKF(self, &opaqueError);
+// CHECK: if (opaqueError != nullptr)
+// CHECK: throw (swift::Error(opaqueError))
 // CHECK: }
 
 public func throwFunction() throws {
@@ -38,7 +58,7 @@ public func throwFunction() throws {
 // CHECK: void* self = nullptr;
 // CHECK: _impl::$s9Functions13throwFunctionyyKF(self, &opaqueError);
 // CHECK: if (opaqueError != nullptr)
-// CHECK: throw (swift::_impl::swift::Error(opaqueError))
+// CHECK: throw (swift::Error(opaqueError))
 // CHECK: }
 
 public func throwFunctionWithReturn() throws -> Int {
@@ -52,6 +72,6 @@ public func throwFunctionWithReturn() throws -> Int {
 // CHECK: void* self = nullptr;
 // CHECK: auto returnValue = _impl::$s9Functions23throwFunctionWithReturnSiyKF(self, &opaqueError);
 // CHECK: if (opaqueError != nullptr)
-// CHECK: throw (swift::_impl::swift::Error(opaqueError))
+// CHECK: throw (swift::Error(opaqueError))
 // CHECK: return returnValue;
 // CHECK: }