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

Clang: Remove export filters

Browse Source 
Lets try to find a better way to do it later.

Change-Id: I960abf65c910f639cc860b8e1291b0c235b7db07
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
This commit is contained in:
Marco Bubke
2018-02-01 15:42:50 +01:00
parent 43a8bd046e
commit 98774d7b92
2 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/tools/clangrefactoringbackend/source/collectmacrospreprocessorcallbacks.h
View File

@@ -167,7 +167,6 @@ public:
{ {
filterOutHeaderGuards(); filterOutHeaderGuards();
mergeUsedMacros(); mergeUsedMacros();
filterOutExports();
} }
void filterOutHeaderGuards() void filterOutHeaderGuards()
@@ -184,17 +183,6 @@ public:
m_maybeUsedMacros.erase(partitionPoint, m_maybeUsedMacros.end()); m_maybeUsedMacros.erase(partitionPoint, m_maybeUsedMacros.end());
} }
void filterOutExports()
{
auto partitionPoint = std::stable_partition(m_usedMacros.begin(),
m_usedMacros.end(),
[&] (const UsedMacro &usedMacro) {
return !usedMacro.macroName.contains("EXPORT");
});
m_usedMacros.erase(partitionPoint, m_usedMacros.end());
}
void mergeUsedMacros() void mergeUsedMacros()
{ {
m_usedMacros.reserve(m_usedMacros.size() + m_maybeUsedMacros.size()); m_usedMacros.reserve(m_usedMacros.size() + m_maybeUsedMacros.size());

4
tests/unit/unittest/symbolscollector-test.cpp
View File

@@ -375,6 +375,7 @@ TEST_F(SymbolsCollector, CollectUsedMacrosWithExternalDefine)
ElementsAre(Eq(UsedMacro{"DEFINED", fileId}), ElementsAre(Eq(UsedMacro{"DEFINED", fileId}),
Eq(UsedMacro{"IF_DEFINE", fileId}), Eq(UsedMacro{"IF_DEFINE", fileId}),
Eq(UsedMacro{"__clang__", fileId}), Eq(UsedMacro{"__clang__", fileId}),
Eq(UsedMacro{"CLASS_EXPORT", fileId}),
Eq(UsedMacro{"IF_NOT_DEFINE", fileId}), Eq(UsedMacro{"IF_NOT_DEFINE", fileId}),
Eq(UsedMacro{"MACRO_EXPANSION", fileId}), Eq(UsedMacro{"MACRO_EXPANSION", fileId}),
Eq(UsedMacro{"COMPILER_ARGUMENT", fileId}))); Eq(UsedMacro{"COMPILER_ARGUMENT", fileId})));
@@ -391,6 +392,7 @@ TEST_F(SymbolsCollector, CollectUsedMacrosWithoutExternalDefine)
ElementsAre(Eq(UsedMacro{"DEFINED", fileId}), ElementsAre(Eq(UsedMacro{"DEFINED", fileId}),
Eq(UsedMacro{"IF_DEFINE", fileId}), Eq(UsedMacro{"IF_DEFINE", fileId}),
Eq(UsedMacro{"__clang__", fileId}), Eq(UsedMacro{"__clang__", fileId}),
Eq(UsedMacro{"CLASS_EXPORT", fileId}),
Eq(UsedMacro{"IF_NOT_DEFINE", fileId}), Eq(UsedMacro{"IF_NOT_DEFINE", fileId}),
Eq(UsedMacro{"MACRO_EXPANSION", fileId}), Eq(UsedMacro{"MACRO_EXPANSION", fileId}),
Eq(UsedMacro{"COMPILER_ARGUMENT", fileId}))); Eq(UsedMacro{"COMPILER_ARGUMENT", fileId})));
@@ -407,7 +409,7 @@ TEST_F(SymbolsCollector, DontCollectHeaderGuards)
Not(Contains(Eq(UsedMacro{"SYMBOLSCOLLECTOR_DEFINES_H", fileId})))); Not(Contains(Eq(UsedMacro{"SYMBOLSCOLLECTOR_DEFINES_H", fileId}))));
} }
TEST_F(SymbolsCollector, DontCollectDynamicLibraryExports) TEST_F(SymbolsCollector, DISABLED_DontCollectDynamicLibraryExports)
{ {
auto fileId = filePathId(TESTDATA_DIR "/symbolscollector_defines.h"); auto fileId = filePathId(TESTDATA_DIR "/symbolscollector_defines.h");
collector.addFiles({fileId}, {"cc"}); collector.addFiles({fileId}, {"cc"});