diff options
| author | Juergen Ributzka <juergen@apple.com> | 2013-11-19 03:08:35 +0000 |
|---|---|---|
| committer | Juergen Ributzka <juergen@apple.com> | 2013-11-19 03:08:35 +0000 |
| commit | 05c5a93283b830032532321fdc4c0fe6b8473aac (patch) | |
| tree | a6dd62ef804f1e97d576d5741db7fb04f1ce771e /llvm/unittests/ExecutionEngine | |
| parent | ef9315d942a0499141769e3c53c8830ee1e74841 (diff) | |
| download | bcm5719-llvm-05c5a93283b830032532321fdc4c0fe6b8473aac.tar.gz bcm5719-llvm-05c5a93283b830032532321fdc4c0fe6b8473aac.zip | |
[weak vtables] Place class definitions into anonymous namespaces to prevent weak vtables.
This patch places class definitions in implementation files into anonymous
namespaces to prevent weak vtables. This eliminates the need of providing an
out-of-line definition to pin the vtable explicitly to the file.
llvm-svn: 195092
Diffstat (limited to 'llvm/unittests/ExecutionEngine')
3 files changed, 15 insertions, 28 deletions
diff --git a/llvm/unittests/ExecutionEngine/MCJIT/MCJITCAPITest.cpp b/llvm/unittests/ExecutionEngine/MCJIT/MCJITCAPITest.cpp index 15c58c480aa..46d6d9b8a9a 100644 --- a/llvm/unittests/ExecutionEngine/MCJIT/MCJITCAPITest.cpp +++ b/llvm/unittests/ExecutionEngine/MCJIT/MCJITCAPITest.cpp @@ -59,6 +59,7 @@ static void roundTripDestroy(void *object) { delete static_cast<SectionMemoryManager*>(object); } +namespace { class MCJITCAPITest : public testing::Test, public MCJITTestAPICommon { protected: MCJITCAPITest() { @@ -83,8 +84,14 @@ protected: UnsupportedOSs.push_back(Triple::Cygwin); } - virtual void SetUp(); - + virtual void SetUp() { + didCallAllocateCodeSection = false; + Module = 0; + Function = 0; + Engine = 0; + Error = 0; + } + virtual void TearDown() { if (Engine) LLVMDisposeExecutionEngine(Engine); @@ -150,15 +157,7 @@ protected: LLVMExecutionEngineRef Engine; char *Error; }; - -// Provide out-of-line definition to prevent weak vtable. -void MCJITCAPITest::SetUp() { - didCallAllocateCodeSection = false; - Module = 0; - Function = 0; - Engine = 0; - Error = 0; -} +} // end anonymous namespace TEST_F(MCJITCAPITest, simple_function) { SKIP_UNSUPPORTED_PLATFORM; diff --git a/llvm/unittests/ExecutionEngine/MCJIT/MCJITMultipleModuleTest.cpp b/llvm/unittests/ExecutionEngine/MCJIT/MCJITMultipleModuleTest.cpp index cea6274656b..7c3239ea259 100644 --- a/llvm/unittests/ExecutionEngine/MCJIT/MCJITMultipleModuleTest.cpp +++ b/llvm/unittests/ExecutionEngine/MCJIT/MCJITMultipleModuleTest.cpp @@ -18,16 +18,10 @@ using namespace llvm; -class MCJITMultipleModuleTest : public testing::Test, public MCJITTestBase { -public: - virtual ~MCJITMultipleModuleTest(); -}; - -// Provide out-of-line definition to prevent weak vtable. -MCJITMultipleModuleTest::~MCJITMultipleModuleTest() {} - namespace { +class MCJITMultipleModuleTest : public testing::Test, public MCJITTestBase {}; + // FIXME: ExecutionEngine has no support empty modules /* TEST_F(MCJITMultipleModuleTest, multiple_empty_modules) { diff --git a/llvm/unittests/ExecutionEngine/MCJIT/MCJITTest.cpp b/llvm/unittests/ExecutionEngine/MCJIT/MCJITTest.cpp index 9786befd720..fab81551fa5 100644 --- a/llvm/unittests/ExecutionEngine/MCJIT/MCJITTest.cpp +++ b/llvm/unittests/ExecutionEngine/MCJIT/MCJITTest.cpp @@ -18,19 +18,13 @@ using namespace llvm; +namespace { + class MCJITTest : public testing::Test, public MCJITTestBase { protected: - - virtual void SetUp(); + virtual void SetUp() { M.reset(createEmptyModule("<main>")); } }; -// Provide out-of-line definition to prevent weak vtable. -void MCJITTest::SetUp() { - M.reset(createEmptyModule("<main>")); -} - -namespace { - // FIXME: Ensure creating an execution engine does not crash when constructed // with a null module. /* |

