Skip to content

Commit

Permalink
Merge bitcoin#26823: refactor: Work around Werror=free-nonheap-object…
Browse files Browse the repository at this point in the history
… in AssumeCalculateMemPoolAncestors

faa86ee refactor: Work around Werror=free-nonheap-object in AssumeCalculateMemPoolAncestors (MarcoFalke)

Pull request description:

  This works around the s390x gcc bug mentioned in bitcoin#26820

ACKs for top commit:
  achow101:
    ACK faa86ee

Tree-SHA512: 041d5daa157ea1856b0a8027181085d70624f5f8822049ace9963e90c653bbb8c91d1f16b8a5bf460687eb4ed13f1db72e3885a511aadbad6dede93d9f9ccd6d
  • Loading branch information
MarcoFalke committed Jan 6, 2023
2 parents b4fb0a3 + faa86ee commit 2cfe379
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/txmempool.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,8 @@ CTxMemPool::setEntries CTxMemPool::AssumeCalculateMemPoolAncestors(
const Limits& limits,
bool fSearchForParents /* = true */) const
{
auto result{Assume(CalculateMemPoolAncestors(entry, limits, fSearchForParents))};
if (!result) {
auto result{CalculateMemPoolAncestors(entry, limits, fSearchForParents)};
if (!Assume(result)) {
LogPrintLevel(BCLog::MEMPOOL, BCLog::Level::Error, "%s: CalculateMemPoolAncestors failed unexpectedly, continuing with empty ancestor set (%s)\n",
calling_fn_name, util::ErrorString(result).original);
}
Expand Down

0 comments on commit 2cfe379

Please sign in to comment.