From: Alex Coyte Date: Mon, 2 May 2016 03:03:17 +0000 (+1000) Subject: restore ability to ignore common preds for merges X-Git-Tag: v4.2.0^2~34 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11896dcf424c1f9f0ab32483d8b0712c004d4b9f;p=thirdparty%2Fvectorscan.git restore ability to ignore common preds for merges Check for common preds was broken during refactoring in b9c5d65: Rework literal overlap checks for merging engines --- diff --git a/src/rose/rose_build_merge.cpp b/src/rose/rose_build_merge.cpp index 42dd4d2f..a10bc86e 100644 --- a/src/rose/rose_build_merge.cpp +++ b/src/rose/rose_build_merge.cpp @@ -1125,7 +1125,7 @@ bool checkPredDelays(const RoseBuildImpl &tbi, const deque &v1, } for (auto u : preds) { - if (!contains(known_good_preds, &u)) { + if (!contains(known_good_preds, u)) { insert(&pred_lits, tbi.g[u].literals); } }