LGTM with the first suggestion (about readability). I am less worried if you
want to merge the drive-by formatting cleanup rather than separating it.
================
Comment at: include/__cxxabi_config.h:13
@@ +12,3 @@
+
+#if !defined(__USING_SJLJ_EXCEPTIONS__) && defined(__arm__) && \
+ !defined(__ARM_DWARF_EH__) && !defined(__APPLE__)
----------------
I think this is more readable as:
#if defined(__arm__) && !defined(__USING_SJLJ_EXCEPTIONS__) &&
!defined(__ARM_DWARF_EH__)
That maps to what the condition really is: you need ARM, non-SJLJ, non-DWARF
exceptions. Apple uses SJLJ exceptions, so adding `!defined(__APPLE__)` seems
... repetitive.
================
Comment at: src/Unwind/UnwindCursor.hpp:26
@@ -25,3 +25,3 @@
-#include "libunwind.h"
+#include "config.h"
----------------
Unless Im mistaken, this part looks like it could be split out into a separate
change.
================
Comment at: src/cxa_exception.cpp:263
@@ -262,5 +262,3 @@
#else
- return cxa_exception_from_exception_unwind_exception
- (
- static_cast<_Unwind_Exception*>(unwind_exception)
- )->adjustedPtr;
+ return cxa_exception_from_exception_unwind_exception(
+ static_cast<_Unwind_Exception*>(unwind_exception))->adjustedPtr;
----------------
Along with the previous.
================
Comment at: src/cxa_exception.hpp:27
@@ -26,4 +26,3 @@
static const uint64_t kOurDependentExceptionClass = 0x434C4E47432B2B01; //
CLNGC++\1
-static const uint64_t get_vendor_and_language = 0xFFFFFFFFFFFFFF00; //
mask for CLNGC++
-
-struct __cxa_exception {
+static const uint64_t get_vendor_and_language = 0xFFFFFFFFFFFFFF00; //
mask for CLNGC++
+
----------------
And this.
http://reviews.llvm.org/D7419
EMAIL PREFERENCES
http://reviews.llvm.org/settings/panel/emailpreferences/
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
