[libcxx-commits] [libcxx] 157c123 - Revert "[libc++] Fix ODR violation with __exception_guard in mixed exceptions builds"

[Nikolas Klauser via libcxx-commits]

Author: Nikolas Klauser
Date: 2023-02-01T16:05:18+01:00
New Revision: 157c12310cbc08d7775714ad12b819c8511065a2

URL: https://github.com/llvm/llvm-project/commit/157c12310cbc08d7775714ad12b819c8511065a2
DIFF: https://github.com/llvm/llvm-project/commit/157c12310cbc08d7775714ad12b819c8511065a2.diff

LOG: Revert "[libc++] Fix ODR violation with __exception_guard in mixed exceptions builds"

This reverts commit 561105fb9d3a16f7fb8c718cc5da71b11f17a144.

This breaks C++03 with -fno-exceptions.

Added: 
    

Modified: 
    libcxx/include/__utility/exception_guard.h

Removed: 
    


################################################################################
diff  --git a/libcxx/include/__utility/exception_guard.h b/libcxx/include/__utility/exception_guard.h
index ccbf75f039dc5..737d1a69c9717 100644
--- a/libcxx/include/__utility/exception_guard.h
+++ b/libcxx/include/__utility/exception_guard.h
@@ -89,7 +89,7 @@ struct __exception_guard {
 };
 #else  // _LIBCPP_NO_EXCEPTIONS
 template <class _Rollback>
-struct [[gnu::abi_tag("-fno-exceptions")]] __exception_guard {
+struct __exception_guard {
   __exception_guard() = delete;
   _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_NODEBUG explicit __exception_guard(_Rollback) {}