diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/processor/range_map-inl.h | 36 |
1 files changed, 23 insertions, 13 deletions
diff --git a/src/processor/range_map-inl.h b/src/processor/range_map-inl.h index 3aa2603a..55dae839 100644 --- a/src/processor/range_map-inl.h +++ b/src/processor/range_map-inl.h @@ -72,12 +72,18 @@ bool RangeMap<AddressType, EntryType>::StoreRange(const AddressType &base, // Some other range begins in the space used by this range. It may be // contained within the space used by this range, or it may extend lower. // Regardless, it is an error. - AddressType other_base = iterator_base->second.base(); - AddressType other_size = iterator_base->first - other_base + 1; - BPLOG(INFO) << "StoreRange failed, an existing range is contained by or " - "extends lower than the new range: new " << - HexString(base) << "+" << HexString(size) << ", existing " << - HexString(other_base) << "+" << HexString(other_size); + // The processor hits this case too frequently with common symbol files. + // This is most appropriate for a DEBUG channel, but since none exists now + // simply comment out this logging. + // + // AddressType other_base = iterator_base->second.base(); + // AddressType other_size = iterator_base->first - other_base + 1; + // BPLOG(INFO) << "StoreRange failed, an existing range is contained by or " + // "extends lower than the new range: new " << + // HexString(base) << "+" << HexString(size) << + // ", existing " << HexString(other_base) << "+" << + // HexString(other_size); + return false; } @@ -86,13 +92,17 @@ bool RangeMap<AddressType, EntryType>::StoreRange(const AddressType &base, // The range above this one overlaps with this one. It may fully // contain this range, or it may begin within this range and extend // higher. Regardless, it's an error. - AddressType other_base = iterator_high->second.base(); - AddressType other_size = iterator_high->first - other_base + 1; - BPLOG(INFO) << "StoreRange failed, an existing range contains or " - "extends higher than the new range: new " << - HexString(base) << "+" << HexString(size) << - ", existing " << - HexString(other_base) << "+" << HexString(other_size); + // The processor hits this case too frequently with common symbol files. + // This is most appropriate for a DEBUG channel, but since none exists now + // simply comment out this logging. + // + // AddressType other_base = iterator_high->second.base(); + // AddressType other_size = iterator_high->first - other_base + 1; + // BPLOG(INFO) << "StoreRange failed, an existing range contains or " + // "extends higher than the new range: new " << + // HexString(base) << "+" << HexString(size) << + // ", existing " << HexString(other_base) << "+" << + // HexString(other_size); return false; } } |