From 98774d7b921ae12885eabc2b8844033d19159ae5 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Thu, 1 Feb 2018 15:42:50 +0100 Subject: [PATCH] Clang: Remove export filters Lets try to find a better way to do it later. Change-Id: I960abf65c910f639cc860b8e1291b0c235b7db07 Reviewed-by: Ivan Donchevskii --- .../source/collectmacrospreprocessorcallbacks.h | 12 ------------ tests/unit/unittest/symbolscollector-test.cpp | 4 +++- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/tools/clangrefactoringbackend/source/collectmacrospreprocessorcallbacks.h b/src/tools/clangrefactoringbackend/source/collectmacrospreprocessorcallbacks.h index d9d792093c6..44b5a870d6f 100644 --- a/src/tools/clangrefactoringbackend/source/collectmacrospreprocessorcallbacks.h +++ b/src/tools/clangrefactoringbackend/source/collectmacrospreprocessorcallbacks.h @@ -167,7 +167,6 @@ public: { filterOutHeaderGuards(); mergeUsedMacros(); - filterOutExports(); } void filterOutHeaderGuards() @@ -184,17 +183,6 @@ public: 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() { m_usedMacros.reserve(m_usedMacros.size() + m_maybeUsedMacros.size()); diff --git a/tests/unit/unittest/symbolscollector-test.cpp b/tests/unit/unittest/symbolscollector-test.cpp index acf0da694ad..ac243f272ca 100644 --- a/tests/unit/unittest/symbolscollector-test.cpp +++ b/tests/unit/unittest/symbolscollector-test.cpp @@ -375,6 +375,7 @@ TEST_F(SymbolsCollector, CollectUsedMacrosWithExternalDefine) ElementsAre(Eq(UsedMacro{"DEFINED", fileId}), Eq(UsedMacro{"IF_DEFINE", fileId}), Eq(UsedMacro{"__clang__", fileId}), + Eq(UsedMacro{"CLASS_EXPORT", fileId}), Eq(UsedMacro{"IF_NOT_DEFINE", fileId}), Eq(UsedMacro{"MACRO_EXPANSION", fileId}), Eq(UsedMacro{"COMPILER_ARGUMENT", fileId}))); @@ -391,6 +392,7 @@ TEST_F(SymbolsCollector, CollectUsedMacrosWithoutExternalDefine) ElementsAre(Eq(UsedMacro{"DEFINED", fileId}), Eq(UsedMacro{"IF_DEFINE", fileId}), Eq(UsedMacro{"__clang__", fileId}), + Eq(UsedMacro{"CLASS_EXPORT", fileId}), Eq(UsedMacro{"IF_NOT_DEFINE", fileId}), Eq(UsedMacro{"MACRO_EXPANSION", fileId}), Eq(UsedMacro{"COMPILER_ARGUMENT", fileId}))); @@ -407,7 +409,7 @@ TEST_F(SymbolsCollector, DontCollectHeaderGuards) 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"); collector.addFiles({fileId}, {"cc"});