Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7a0ea5a authored by Bernie Innocenti's avatar Bernie Innocenti Committed by Automerger Merge Worker
Browse files

Merge "Add explicit Result::has_value() checks where needed" am: 989efb67 am: 32ffd0d4 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1533183

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idb3622bb54025e5f7e1c68d4f6eb2c399edec9dc
parents eb9ef06e 32ffd0d4

trusty/coverage/coverage.cpp

+3 −3
Original line number Diff line number Diff line
@@ -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;