diff options
author | Saleem Abdulrasool <compnerd@compnerd.org> | 2015-02-05 23:59:11 +0000 |
---|---|---|
committer | Saleem Abdulrasool <compnerd@compnerd.org> | 2015-02-05 23:59:11 +0000 |
commit | 37dd631804059ee13a0af48c4280843edff5632a (patch) | |
tree | 5673e42d2c3522c45918bd990642ef4e5190da85 | |
parent | 271e2646e88051000ac931d6ea27f66336514427 (diff) | |
download | bcm5719-llvm-37dd631804059ee13a0af48c4280843edff5632a.tar.gz bcm5719-llvm-37dd631804059ee13a0af48c4280843edff5632a.zip |
Revert "indicate tag type in C"
This reverts commit 4963ea3107a2fdfae21f7806896905f20b21ff0d.
This change was wrong. The parameter type is sugared via a typedef. The errors
generated may have been due to a different root cause, and should be fixed
through the recent series of changes.
llvm-svn: 228365
-rw-r--r-- | libcxxabi/src/Unwind/UnwindLevel1-gcc-ext.c | 4 | ||||
-rw-r--r-- | libcxxabi/src/Unwind/UnwindLevel1.c | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/libcxxabi/src/Unwind/UnwindLevel1-gcc-ext.c b/libcxxabi/src/Unwind/UnwindLevel1-gcc-ext.c index 4c2e9cc1c26..0ddeb8b2975 100644 --- a/libcxxabi/src/Unwind/UnwindLevel1-gcc-ext.c +++ b/libcxxabi/src/Unwind/UnwindLevel1-gcc-ext.c @@ -26,7 +26,7 @@ /// Called by __cxa_rethrow(). _LIBUNWIND_EXPORT _Unwind_Reason_Code -_Unwind_Resume_or_Rethrow(struct _Unwind_Exception *exception_object) { +_Unwind_Resume_or_Rethrow(_Unwind_Exception *exception_object) { #if LIBCXXABI_ARM_EHABI _LIBUNWIND_TRACE_API("_Unwind_Resume_or_Rethrow(ex_obj=%p), " "private_1=%ld\n", @@ -142,7 +142,7 @@ _Unwind_Backtrace(_Unwind_Trace_Fn callback, void *ref) { // _US_FORCE_UNWIND) state. // Create a mock exception object for force unwinding. - struct _Unwind_Exception ex; + _Unwind_Exception ex; ex.exception_class = 0x434C4E47554E5700; // CLNGUNW\0 ex.pr_cache.fnstart = frameInfo.start_ip; ex.pr_cache.ehtp = (_Unwind_EHT_Header *) unwindInfo; diff --git a/libcxxabi/src/Unwind/UnwindLevel1.c b/libcxxabi/src/Unwind/UnwindLevel1.c index 222fdb98168..9dde70dd663 100644 --- a/libcxxabi/src/Unwind/UnwindLevel1.c +++ b/libcxxabi/src/Unwind/UnwindLevel1.c @@ -26,7 +26,7 @@ #if _LIBUNWIND_BUILD_ZERO_COST_APIS && !LIBCXXABI_ARM_EHABI static _Unwind_Reason_Code -unwind_phase1(unw_context_t *uc, struct _Unwind_Exception *exception_object) { +unwind_phase1(unw_context_t *uc, _Unwind_Exception *exception_object) { unw_cursor_t cursor1; unw_init_local(&cursor1, uc); @@ -119,7 +119,7 @@ unwind_phase1(unw_context_t *uc, struct _Unwind_Exception *exception_object) { static _Unwind_Reason_Code -unwind_phase2(unw_context_t *uc, struct _Unwind_Exception *exception_object) { +unwind_phase2(unw_context_t *uc, _Unwind_Exception *exception_object) { unw_cursor_t cursor2; unw_init_local(&cursor2, uc); @@ -227,7 +227,7 @@ unwind_phase2(unw_context_t *uc, struct _Unwind_Exception *exception_object) { static _Unwind_Reason_Code unwind_phase2_forced(unw_context_t *uc, - struct _Unwind_Exception *exception_object, + _Unwind_Exception *exception_object, _Unwind_Stop_Fn stop, void *stop_parameter) { unw_cursor_t cursor2; unw_init_local(&cursor2, uc); @@ -328,7 +328,7 @@ unwind_phase2_forced(unw_context_t *uc, /// Called by __cxa_throw. Only returns if there is a fatal error. _LIBUNWIND_EXPORT _Unwind_Reason_Code -_Unwind_RaiseException(struct _Unwind_Exception *exception_object) { +_Unwind_RaiseException(_Unwind_Exception *exception_object) { _LIBUNWIND_TRACE_API("_Unwind_RaiseException(ex_obj=%p)\n", exception_object); unw_context_t uc; @@ -362,7 +362,7 @@ _Unwind_RaiseException(struct _Unwind_Exception *exception_object) { /// is implemented by having the code call __cxa_rethrow() which /// in turn calls _Unwind_Resume_or_Rethrow(). _LIBUNWIND_EXPORT void -_Unwind_Resume(struct _Unwind_Exception *exception_object) { +_Unwind_Resume(_Unwind_Exception *exception_object) { _LIBUNWIND_TRACE_API("_Unwind_Resume(ex_obj=%p)\n", exception_object); unw_context_t uc; unw_getcontext(&uc); @@ -384,7 +384,7 @@ _Unwind_Resume(struct _Unwind_Exception *exception_object) { /// Unwinds stack, calling "stop" function at each frame. /// Could be used to implement longjmp(). _LIBUNWIND_EXPORT _Unwind_Reason_Code -_Unwind_ForcedUnwind(struct _Unwind_Exception *exception_object, +_Unwind_ForcedUnwind(_Unwind_Exception *exception_object, _Unwind_Stop_Fn stop, void *stop_parameter) { _LIBUNWIND_TRACE_API("_Unwind_ForcedUnwind(ex_obj=%p, stop=%p)\n", exception_object, stop); @@ -489,7 +489,7 @@ _Unwind_GetRegionStart(struct _Unwind_Context *context) { /// Called by personality handler during phase 2 if a foreign exception // is caught. _LIBUNWIND_EXPORT void -_Unwind_DeleteException(struct _Unwind_Exception *exception_object) { +_Unwind_DeleteException(_Unwind_Exception *exception_object) { _LIBUNWIND_TRACE_API("_Unwind_DeleteException(ex_obj=%p)\n", exception_object); if (exception_object->exception_cleanup != NULL) |