[libc++] Remove emscripten handling from exception_fallback.ipp

sbc100 · sbc100 · commit e84c3b2fc828 · 2020-11-09T16:09:54.000-08:00
Emscripten doesn't use this file (at least not anymore), it uses exception_libcxxabi.ipp since _LIBCPPABI_VERSION is defined. Differential Revision: https://reviews.llvm.org/D91041
diff --git a/libcxx/src/support/runtime/exception_fallback.ipp b/libcxx/src/support/runtime/exception_fallback.ipp
@@ -49,7 +49,6 @@ get_terminate() _NOEXCEPT
   return __libcpp_atomic_load(&__terminate_handler);
 }
 
-#ifndef __EMSCRIPTEN__ // We provide this in JS
 _LIBCPP_NORETURN
 void
 terminate() _NOEXCEPT
@@ -72,9 +71,7 @@ terminate() _NOEXCEPT
     }
 #endif  // _LIBCPP_NO_EXCEPTIONS
 }
-#endif // !__EMSCRIPTEN__
 
-#if !defined(__EMSCRIPTEN__)
 bool uncaught_exception() _NOEXCEPT { return uncaught_exceptions() > 0; }
 
 int uncaught_exceptions() _NOEXCEPT
@@ -83,7 +80,6 @@ int uncaught_exceptions() _NOEXCEPT
   fprintf(stderr, "uncaught_exceptions not yet implemented\n");
   ::abort();
 }
-#endif // !__EMSCRIPTEN__
 
 
 exception::~exception() _NOEXCEPT

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,6 @@ get_terminate() _NOEXCEPT`
`49`	`49`	`return __libcpp_atomic_load(&__terminate_handler);`
`50`	`50`	`}`
`51`	`51`
`52`		`-#ifndef __EMSCRIPTEN__ // We provide this in JS`
`53`	`52`	`_LIBCPP_NORETURN`
`54`	`53`	`void`
`55`	`54`	`terminate() _NOEXCEPT`
`@@ -72,9 +71,7 @@ terminate() _NOEXCEPT`
`72`	`71`	`}`
`73`	`72`	`#endif // _LIBCPP_NO_EXCEPTIONS`
`74`	`73`	`}`
`75`		`-#endif // !__EMSCRIPTEN__`
`76`	`74`
`77`		`-#if !defined(__EMSCRIPTEN__)`
`78`	`75`	`bool uncaught_exception() _NOEXCEPT { return uncaught_exceptions() > 0; }`
`79`	`76`
`80`	`77`	`int uncaught_exceptions() _NOEXCEPT`
`@@ -83,7 +80,6 @@ int uncaught_exceptions() _NOEXCEPT`
`83`	`80`	`fprintf(stderr, "uncaught_exceptions not yet implemented\n");`
`84`	`81`	`::abort();`
`85`	`82`	`}`
`86`		`-#endif // !__EMSCRIPTEN__`
`87`	`83`
`88`	`84`
`89`	`85`	`exception::~exception() _NOEXCEPT`