diff options
| author | Bernie Innocenti <codewiz@google.com> | 2020-12-20 08:06:27 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-20 08:06:27 +0000 |
| commit | a7a0ea5a51a091a36ab0c5338d7bc2f783b45027 (patch) | |
| tree | b76097a64def0b6700e8de04f57b9956b04e8871 /trusty/coverage/coverage.cpp | |
| parent | eb9ef06e6ce7cbd0a3b9496c5ed65b665a20da1f (diff) | |
| parent | 32ffd0d4ca3bb31652b9b5d0128e0b6cd678b6fe (diff) | |
Merge "Add explicit Result::has_value() checks where needed" am: 989efb67e3 am: 32ffd0d4ca
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1533183
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idb3622bb54025e5f7e1c68d4f6eb2c399edec9dc
Diffstat (limited to 'trusty/coverage/coverage.cpp')
| -rw-r--r-- | trusty/coverage/coverage.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/trusty/coverage/coverage.cpp b/trusty/coverage/coverage.cpp index 9413ce385..f383dd14a 100644 --- a/trusty/coverage/coverage.cpp +++ b/trusty/coverage/coverage.cpp @@ -142,7 +142,7 @@ Result<void> CoverageRecord::Open() { void CoverageRecord::ResetFullRecord() { auto header_region = GetRegionBounds(COV_START); - if (!header_region) { + if (!header_region.ok()) { // If the header cannot be parsed, we can't reset the proper region yet. return; } @@ -202,7 +202,7 @@ void CoverageRecord::GetRawData(volatile void** begin, volatile void** end) { void CoverageRecord::GetRawCounts(volatile uint8_t** begin, volatile uint8_t** end) { auto region = GetRegionBounds(COV_8BIT_COUNTERS); - if (!region) { + if (!region.ok()) { *begin = 0; *end = 0; return; @@ -216,7 +216,7 @@ void CoverageRecord::GetRawCounts(volatile uint8_t** begin, volatile uint8_t** e void CoverageRecord::GetRawPCs(volatile uintptr_t** begin, volatile uintptr_t** end) { auto region = GetRegionBounds(COV_INSTR_PCS); - if (!region) { + if (!region.ok()) { *begin = 0; *end = 0; return; |