feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ClangPchManager: Optimize UsedMacroFilter

Browse Source 
We need only run one time over all elements.

Change-Id: I98061014380874549b1976fe6d6a32af43fedfea
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
This commit is contained in:
Marco Bubke
2019-02-19 14:13:36 +01:00
committed by Ivan Donchevskii
parent bfee82fa2c
commit caf6755426
1 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/tools/clangpchmanagerbackend/source/usedmacrofilter.h
View File

@@ -53,6 +53,29 @@ inline OutputIterator set_greedy_intersection(InputIterator1 first1,
return result;
}
template<typename InputIterator1, typename InputIterator2, typename OutputIterator, typename Compare>
inline OutputIterator fill_with_second_values(InputIterator1 first1,
InputIterator1 last1,
InputIterator2 first2,
InputIterator2 last2,
OutputIterator result,
Compare comp)
{
while (first1 != last1 && first2 != last2)
if (comp(*first1, *first2)) {
*result = *first1;
++first1;
++result;
} else if (comp(*first2, *first1))
++first2;
else {
*result = *first2;
++first1;
++result;
}
return result;
}
class UsedMacroFilter
{
public:
@@ -160,7 +183,7 @@ private:
const Utils::SmallStringVector &usedMacros)
{
CompilerMacros filtertedCompilerMacros;
filtertedCompilerMacros.reserve(indexedCompilerMacro.size() + usedMacros.size());
filtertedCompilerMacros.reserve(usedMacros.size());
struct Compare
{
@@ -175,24 +198,13 @@ private:
}
};
set_greedy_intersection(indexedCompilerMacro.begin(),
fill_with_second_values(usedMacros.begin(),
usedMacros.end(),
indexedCompilerMacro.begin(),
indexedCompilerMacro.end(),
usedMacros.begin(),
usedMacros.end(),
std::back_inserter(filtertedCompilerMacros),
Compare{});
auto split = filtertedCompilerMacros.end();
std::set_difference(usedMacros.begin(),
usedMacros.end(),
filtertedCompilerMacros.begin(),
filtertedCompilerMacros.end(),
std::back_inserter(filtertedCompilerMacros),
Compare{});
std::inplace_merge(filtertedCompilerMacros.begin(), split, filtertedCompilerMacros.end());
return filtertedCompilerMacros;
}