remove no longer needed bad_exception hack; fixes #2560; 1.21.6

emscripten-core · Jul 22, 2014 · 803d923 · 803d923
1 parent 0efb852
commit 803d923
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/emscripten-version.txt b/emscripten-version.txt
@@ -1,2 +1,2 @@
-1.21.5
+1.21.6
 
diff --git a/system/lib/libcxxabi/src/exception.cpp b/system/lib/libcxxabi/src/exception.cpp
@@ -25,7 +25,6 @@ const char* exception::what() const _NOEXCEPT
   return "std::exception";
 }
 
-#ifndef __EMSCRIPTEN__
 // bad_exception
 
 bad_exception::~bad_exception() _NOEXCEPT
@@ -36,7 +35,6 @@ const char* bad_exception::what() const _NOEXCEPT
 {
   return "std::bad_exception";
 }
-#endif
 
 }  // std
 

diff --git a/tests/core/test_exceptions_std.in b/tests/core/test_exceptions_std.in
@@ -10,5 +10,8 @@ int main() {
     printf("what? %s\n", e.what());
     printf("caught std::exception\n");
   }
+  catch (int x) {
+    throw std::bad_exception();
+  }
   return 0;
 }
diff --git a/tests/test_core.py b/tests/test_core.py
@@ -1470,6 +1470,7 @@ def test_exceptions_multi(self):
   def test_exceptions_std(self):
     if self.emcc_args is None: return self.skip('requires emcc')
     Settings.DISABLE_EXCEPTION_CATCHING = 0
+    Settings.ERROR_ON_UNDEFINED_SYMBOLS = 1
     self.emcc_args += ['-s', 'SAFE_HEAP=0']
 
     test_path = path_from_root('tests', 'core', 'test_exceptions_std')