[libcxx-commits] [PATCH] D91041: [libc++] Remove emscripten handling from exception_fallback.ipp

[Sam Clegg via Phabricator via libcxx-commits]

sbc100 created this revision.
Herald added subscribers: libcxx-commits, wingo.
Herald added a project: libc++.
Herald added a reviewer: libc++.
sbc100 requested review of this revision.
Herald added a subscriber: aheejin.

Emscripten doesn't use this file (at least not anymore), it uses
exception_libcxxabi.ipp since _LIBCPPABI_VERSION is defined.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D91041

Files:
  libcxx/src/support/runtime/exception_fallback.ipp


Index: libcxx/src/support/runtime/exception_fallback.ipp
===================================================================
--- libcxx/src/support/runtime/exception_fallback.ipp
+++ libcxx/src/support/runtime/exception_fallback.ipp
@@ -49,7 +49,6 @@
   return __libcpp_atomic_load(&__terminate_handler);
 }
 
-#ifndef __EMSCRIPTEN__ // We provide this in JS
 _LIBCPP_NORETURN
 void
 terminate() _NOEXCEPT
@@ -72,9 +71,7 @@
     }
 #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 @@
   fprintf(stderr, "uncaught_exceptions not yet implemented\n");
   ::abort();
 }
-#endif // !__EMSCRIPTEN__
 
 
 exception::~exception() _NOEXCEPT


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D91041.303736.patch
Type: text/x-patch
Size: 807 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20201108/ad47dc32/attachment.bin>