summary refs log tree commit diff
path: root/src/test/run-make-fulldeps/foreign-exceptions/foo.cpp
diff options
context:
space:
mode:
authorAmanieu d'Antras <amanieu@gmail.com>2019-10-27 22:33:25 +0000
committerAmanieu d'Antras <amanieu@gmail.com>2019-11-03 14:03:21 +0000
commitad61c88e729acf9dbbe17493faeedb760c6df08c (patch)
tree23b2d2f985ad3edd337566337ac4be4e3a14cd68 /src/test/run-make-fulldeps/foreign-exceptions/foo.cpp
parent83d6bf49296dd2c365ee3989d114a99db9ca3577 (diff)
downloadrust-ad61c88e729acf9dbbe17493faeedb760c6df08c.tar.gz
rust-ad61c88e729acf9dbbe17493faeedb760c6df08c.zip
Make SEH exceptions use a rust_panic type instead of unsigned __int64*
Diffstat (limited to 'src/test/run-make-fulldeps/foreign-exceptions/foo.cpp')
-rw-r--r--src/test/run-make-fulldeps/foreign-exceptions/foo.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/test/run-make-fulldeps/foreign-exceptions/foo.cpp b/src/test/run-make-fulldeps/foreign-exceptions/foo.cpp
index 9a6fab49f49..b0fd65f88e7 100644
--- a/src/test/run-make-fulldeps/foreign-exceptions/foo.cpp
+++ b/src/test/run-make-fulldeps/foreign-exceptions/foo.cpp
@@ -8,6 +8,7 @@ void println(const char* s) {
 }
 
 struct exception {};
+struct rust_panic {};
 
 struct drop_check {
     bool* ok;
@@ -45,7 +46,7 @@ extern "C" {
         x.ok = NULL;
         try {
             cb();
-        } catch (exception e) {
+        } catch (rust_panic e) {
             assert(false && "shouldn't be able to catch a rust panic");
         } catch (...) {
             println("caught foreign exception in catch (...)");