diff options
| author | Chih-hung Hsieh <chh@google.com> | 2018-09-17 17:36:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-09-17 17:36:09 +0000 |
| commit | b39f8d2538522d143b516ffa827c9906b422cc2e (patch) | |
| tree | 7b798c78002635606e2a8f341c2982857137bfec | |
| parent | 616cb30c1dc5485248e94d6fa8cfb3f497f8e1dc (diff) | |
| parent | 8bf1b30d9e2972dbab98e9c76d471ec7754e7072 (diff) | |
| download | unwinding-b39f8d2538522d143b516ffa827c9906b422cc2e.tar.gz | |
Merge "Suppress implicit-fallthrough warnings."
| -rw-r--r-- | libunwindstack/DwarfCfa.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libunwindstack/DwarfCfa.cpp b/libunwindstack/DwarfCfa.cpp index cd9ef61..0fa1638 100644 --- a/libunwindstack/DwarfCfa.cpp +++ b/libunwindstack/DwarfCfa.cpp @@ -21,6 +21,7 @@ #include <type_traits> #include <vector> +#include <android-base/macros.h> #include <android-base/stringprintf.h> #include <unwindstack/DwarfError.h> @@ -154,13 +155,15 @@ std::string DwarfCfa<AddressType>::GetOperandString(uint8_t operand, uint64_t va break; case DwarfCfaInfo::DWARF_DISPLAY_ADVANCE_LOC: *cur_pc += value; - // Fall through to log the value. + FALLTHROUGH_INTENDED; + // Fall through to log the value. case DwarfCfaInfo::DWARF_DISPLAY_NUMBER: string += " " + std::to_string(value); break; case DwarfCfaInfo::DWARF_DISPLAY_SET_LOC: *cur_pc = value; - // Fall through to log the value. + FALLTHROUGH_INTENDED; + // Fall through to log the value. case DwarfCfaInfo::DWARF_DISPLAY_ADDRESS: if (std::is_same<AddressType, uint32_t>::value) { string += android::base::StringPrintf(" 0x%" PRIx32, static_cast<uint32_t>(value)); |