[SwiftToCxx] Trowing Swift::Error instead of NaiveException

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::NaiveException(\"Exception\"));\n";
+    os << "    throw (swift::_impl::swift::Error(opaqueError));\n";
   }
 
   // Return the function result value if it doesn't throw.

stdlib/public/SwiftShims/_SwiftCxxInteroperability.h

@@ -180,6 +180,7 @@ namespace swift {
 class Error {
 public:
   Error() {}
+  Error(void* _Nonnull swiftError) { opaqueValue = swiftError; }
   ~Error() {
     if (opaqueValue)
       swift_errorRelease(opaqueValue);

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

@@ -21,18 +21,18 @@ int main() {
 
   try {
     Functions::emptyThrowFunction();
-  } catch (swift::_impl::NaiveException& e) {
-    printf("%s\n", e.getMessage());
+  } catch (swift::_impl::swift::Error& e) {
+    printf("Exception\n");
   }
   try {
     Functions::throwFunction();
-  } catch (swift::_impl::NaiveException& e) {
-    printf("%s\n", e.getMessage());
+  } catch (swift::_impl::swift::Error& e) {
+     printf("Exception\n");
   }
   try {
     Functions::throwFunctionWithReturn();
-  } catch (swift::_impl::NaiveException& e) {
-    printf("%s\n", e.getMessage());
+  } catch (swift::_impl::swift::Error& e) {
+     printf("Exception\n");
   }
 
   return 0;

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

@@ -25,7 +25,7 @@ public func emptyThrowFunction() throws { print("passEmptyThrowFunction") }
 // CHECK: void* self = nullptr;
 // CHECK: _impl::$s9Functions18emptyThrowFunctionyyKF(self, &opaqueError);
 // CHECK: if (opaqueError != nullptr)
-// CHECK: throw (swift::_impl::NaiveException("Exception"));
+// CHECK: throw (swift::_impl::swift::Error(opaqueError))
 // CHECK: }
 
 public func throwFunction() throws {
@@ -38,7 +38,7 @@ public func throwFunction() throws {
 // CHECK: void* self = nullptr;
 // CHECK: _impl::$s9Functions13throwFunctionyyKF(self, &opaqueError);
 // CHECK: if (opaqueError != nullptr)
-// CHECK: throw (swift::_impl::NaiveException("Exception"));
+// CHECK: throw (swift::_impl::swift::Error(opaqueError))
 // CHECK: }
 
 public func throwFunctionWithReturn() throws -> Int {
@@ -52,6 +52,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::NaiveException("Exception"));
+// CHECK: throw (swift::_impl::swift::Error(opaqueError))
 // CHECK: return returnValue;
 // CHECK: }