diff options
| author | Saleem Abdulrasool <compnerd@compnerd.org> | 2015-02-13 17:36:11 +0000 |
|---|---|---|
| committer | Saleem Abdulrasool <compnerd@compnerd.org> | 2015-02-13 17:36:11 +0000 |
| commit | ebfe815f5ca29dfd196af9077156b51bdbd01660 (patch) | |
| tree | 0d57376764cc9fb782b47ad273fe70e5db9edfa9 /libcxxabi/src | |
| parent | cc39d3f4bd1e457b8356d68d9e083e3d39c04e8d (diff) | |
| download | bcm5719-llvm-ebfe815f5ca29dfd196af9077156b51bdbd01660.tar.gz bcm5719-llvm-ebfe815f5ca29dfd196af9077156b51bdbd01660.zip | |
unwind: use sizeof() instead of hardcoded sizes
The statically allocated strings have a fixed size which can be computed using
the sizeof operator rather than duplicating the allocation size which can drift.
NFC.
llvm-svn: 229126
Diffstat (limited to 'libcxxabi/src')
| -rw-r--r-- | libcxxabi/src/Unwind/Unwind-EHABI.cpp | 10 | ||||
| -rw-r--r-- | libcxxabi/src/Unwind/UnwindLevel1.c | 15 |
2 files changed, 15 insertions, 10 deletions
diff --git a/libcxxabi/src/Unwind/Unwind-EHABI.cpp b/libcxxabi/src/Unwind/Unwind-EHABI.cpp index 2afe86cc2e4..7ebba67fbcb 100644 --- a/libcxxabi/src/Unwind/Unwind-EHABI.cpp +++ b/libcxxabi/src/Unwind/Unwind-EHABI.cpp @@ -473,8 +473,9 @@ unwind_phase1(unw_context_t *uc, _Unwind_Exception *exception_object) { char functionBuf[512]; const char *functionName = functionBuf; unw_word_t offset; - if ((unw_get_proc_name(&cursor1, functionBuf, 512, &offset) != - UNW_ESUCCESS) || (frameInfo.start_ip + offset > frameInfo.end_ip)) + if ((unw_get_proc_name(&cursor1, functionBuf, sizeof(functionBuf), + &offset) != UNW_ESUCCESS) || + (frameInfo.start_ip + offset > frameInfo.end_ip)) functionName = ".anonymous."; unw_word_t pc; unw_get_reg(&cursor1, UNW_REG_IP, &pc); @@ -604,8 +605,9 @@ static _Unwind_Reason_Code unwind_phase2(unw_context_t *uc, char functionBuf[512]; const char *functionName = functionBuf; unw_word_t offset; - if ((unw_get_proc_name(&cursor2, functionBuf, 512, &offset) != - UNW_ESUCCESS) || (frameInfo.start_ip + offset > frameInfo.end_ip)) + if ((unw_get_proc_name(&cursor2, functionBuf, sizeof(functionBuf), + &offset) != UNW_ESUCCESS) || + (frameInfo.start_ip + offset > frameInfo.end_ip)) functionName = ".anonymous."; _LIBUNWIND_TRACE_UNWINDING( "unwind_phase2(ex_ojb=%p): start_ip=0x%llX, func=%s, sp=0x%llX, " diff --git a/libcxxabi/src/Unwind/UnwindLevel1.c b/libcxxabi/src/Unwind/UnwindLevel1.c index 76dd1043a1d..5b911de50b9 100644 --- a/libcxxabi/src/Unwind/UnwindLevel1.c +++ b/libcxxabi/src/Unwind/UnwindLevel1.c @@ -63,8 +63,9 @@ unwind_phase1(unw_context_t *uc, _Unwind_Exception *exception_object) { char functionBuf[512]; const char *functionName = functionBuf; unw_word_t offset; - if ((unw_get_proc_name(&cursor1, functionBuf, 512, &offset) != - UNW_ESUCCESS) || (frameInfo.start_ip + offset > frameInfo.end_ip)) + if ((unw_get_proc_name(&cursor1, functionBuf, sizeof(functionBuf), + &offset) != UNW_ESUCCESS) || + (frameInfo.start_ip + offset > frameInfo.end_ip)) functionName = ".anonymous."; unw_word_t pc; unw_get_reg(&cursor1, UNW_REG_IP, &pc); @@ -160,8 +161,9 @@ unwind_phase2(unw_context_t *uc, _Unwind_Exception *exception_object) { char functionBuf[512]; const char *functionName = functionBuf; unw_word_t offset; - if ((unw_get_proc_name(&cursor2, functionBuf, 512, &offset) != - UNW_ESUCCESS) || (frameInfo.start_ip + offset > frameInfo.end_ip)) + if ((unw_get_proc_name(&cursor2, functionBuf, sizeof(functionBuf), + &offset) != UNW_ESUCCESS) || + (frameInfo.start_ip + offset > frameInfo.end_ip)) functionName = ".anonymous."; _LIBUNWIND_TRACE_UNWINDING("unwind_phase2(ex_ojb=%p): start_ip=0x%" PRIx64 ", func=%s, sp=0x%" PRIx64 ", lsda=0x%" PRIx64 @@ -251,8 +253,9 @@ unwind_phase2_forced(unw_context_t *uc, char functionBuf[512]; const char *functionName = functionBuf; unw_word_t offset; - if ((unw_get_proc_name(&cursor2, functionBuf, 512, &offset) != - UNW_ESUCCESS) || (frameInfo.start_ip + offset > frameInfo.end_ip)) + if ((unw_get_proc_name(&cursor2, functionBuf, sizeof(functionBuf), + &offset) != UNW_ESUCCESS) || + (frameInfo.start_ip + offset > frameInfo.end_ip)) functionName = ".anonymous."; _LIBUNWIND_TRACE_UNWINDING( "unwind_phase2_forced(ex_ojb=%p): start_ip=0x%" PRIx64 |
