diff options
author | Juergen Ributzka <juergen@apple.com> | 2013-11-19 00:57:56 +0000 |
---|---|---|
committer | Juergen Ributzka <juergen@apple.com> | 2013-11-19 00:57:56 +0000 |
commit | 354362524a72b3fa43a6c09380b7ae3b2380cbba (patch) | |
tree | db9821d531f3ec0554d83400221f54e4e322877b /unittests | |
parent | 26efdc5621043d28dc0c78addc7b7a75d1591a10 (diff) | |
download | external_llvm-354362524a72b3fa43a6c09380b7ae3b2380cbba.zip external_llvm-354362524a72b3fa43a6c09380b7ae3b2380cbba.tar.gz external_llvm-354362524a72b3fa43a6c09380b7ae3b2380cbba.tar.bz2 |
[weak vtables] Remove a bunch of weak vtables
This patch removes most of the trivial cases of weak vtables by pinning them to
a single object file. The memory leaks in this version have been fixed. Thanks
Alexey for pointing them out.
Differential Revision: http://llvm-reviews.chandlerc.com/D2068
Reviewed by Andy
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@195064 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'unittests')
4 files changed, 28 insertions, 13 deletions
diff --git a/unittests/ADT/IntrusiveRefCntPtrTest.cpp b/unittests/ADT/IntrusiveRefCntPtrTest.cpp index 0c8c4ca..a74e05e 100644 --- a/unittests/ADT/IntrusiveRefCntPtrTest.cpp +++ b/unittests/ADT/IntrusiveRefCntPtrTest.cpp @@ -13,9 +13,12 @@ namespace llvm { struct VirtualRefCounted : public RefCountedBaseVPTR { - virtual void f() {} + virtual void f(); }; +// Provide out-of-line definition to prevent weak vtable. +void VirtualRefCounted::f() {} + // Run this test with valgrind to detect memory leaks. TEST(IntrusiveRefCntPtr, RefCountedBaseVPTRCopyDoesNotLeak) { VirtualRefCounted *V1 = new VirtualRefCounted; diff --git a/unittests/ExecutionEngine/MCJIT/MCJITCAPITest.cpp b/unittests/ExecutionEngine/MCJIT/MCJITCAPITest.cpp index e4197dd..15c58c4 100644 --- a/unittests/ExecutionEngine/MCJIT/MCJITCAPITest.cpp +++ b/unittests/ExecutionEngine/MCJIT/MCJITCAPITest.cpp @@ -83,14 +83,8 @@ protected: UnsupportedOSs.push_back(Triple::Cygwin); } - virtual void SetUp() { - didCallAllocateCodeSection = false; - Module = 0; - Function = 0; - Engine = 0; - Error = 0; - } - + virtual void SetUp(); + virtual void TearDown() { if (Engine) LLVMDisposeExecutionEngine(Engine); @@ -157,6 +151,15 @@ protected: char *Error; }; +// Provide out-of-line definition to prevent weak vtable. +void MCJITCAPITest::SetUp() { + didCallAllocateCodeSection = false; + Module = 0; + Function = 0; + Engine = 0; + Error = 0; +} + TEST_F(MCJITCAPITest, simple_function) { SKIP_UNSUPPORTED_PLATFORM; diff --git a/unittests/ExecutionEngine/MCJIT/MCJITMultipleModuleTest.cpp b/unittests/ExecutionEngine/MCJIT/MCJITMultipleModuleTest.cpp index 4d650e8..cea6274 100644 --- a/unittests/ExecutionEngine/MCJIT/MCJITMultipleModuleTest.cpp +++ b/unittests/ExecutionEngine/MCJIT/MCJITMultipleModuleTest.cpp @@ -18,7 +18,13 @@ using namespace llvm; -class MCJITMultipleModuleTest : public testing::Test, public MCJITTestBase {}; +class MCJITMultipleModuleTest : public testing::Test, public MCJITTestBase { +public: + virtual ~MCJITMultipleModuleTest(); +}; + +// Provide out-of-line definition to prevent weak vtable. +MCJITMultipleModuleTest::~MCJITMultipleModuleTest() {} namespace { diff --git a/unittests/ExecutionEngine/MCJIT/MCJITTest.cpp b/unittests/ExecutionEngine/MCJIT/MCJITTest.cpp index 7ccd254..9786bef 100644 --- a/unittests/ExecutionEngine/MCJIT/MCJITTest.cpp +++ b/unittests/ExecutionEngine/MCJIT/MCJITTest.cpp @@ -21,11 +21,14 @@ using namespace llvm; class MCJITTest : public testing::Test, public MCJITTestBase { protected: - virtual void SetUp() { - M.reset(createEmptyModule("<main>")); - } + virtual void SetUp(); }; +// 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 |