Changeset 9fe2fd7 in mainline for uspace/lib/cpp/include/__bits/trycatch.hpp

Timestamp:

2019-07-24T11:44:40Z (5 years ago)

Author:

GitHub <noreply@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a448937, f42ee6f

Parents:

9fb280c (diff), 8c0b781 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jaroslav Jindrak <Dzejrou@…> (2019-07-24 11:44:40)

git-committer:

GitHub <noreply@…> (2019-07-24 11:44:40)

Message:

Merge pull request #171 from Dzejrou/hackweek

C++ stdlib: <future>

File:

• uspace/lib/cpp/include/__bits/trycatch.hpp (modified) (2 diffs)

uspace/lib/cpp/include/__bits/trycatch.hpp

@@ -67 +67 @@
 
 /**
+ * The language allows us to odr-use a variable
+ * that is not defined. We use this to support
+ * macros redefining the catch keyword that are
+ * followed by a block that uses that symbol.
+ *
+ * Normally, that would produce a compiler error
+ * as the declaration of that variale would be removed
+ * with the catch statement, but if we use the following
+ * declaration's name as the name of the caught exception,
+ * all will work well because of this extern declaration.
+ *
+ * Note: We do not follow our usual convention of using
+ * the aux:: namespace because that cannot be used in
+ * variable declaration.
+ */
+extern int __exception;
+
+/**
  * These macros allow us to choose how the program
  * should behave when an exception is thrown
@@ -87 +105 @@
 #define LIBCPP_EXCEPTION_IGNORE       /* IGNORE */
 #define LIBCPP_EXCEPTION_HANDLE_THROW LIBCPP_EXCEPTION_IGNORE
-#define LIBCPP_EXCEPTION_HANDLE_CATCH LIBCPP_EXCEPTION_HANG
+#define LIBCPP_EXCEPTION_HANDLE_CATCH LIBCPP_EXCEPTION_ABORT
 
 #define try if constexpr (::std::aux::try_blocks_allowed)