From b21ab43cfc3fa0dacf5c95f04e58b6d804b59a16 Mon Sep 17 00:00:00 2001
From: Alexey Samsonov <samsonov@google.com>
Date: Mon, 18 Nov 2013 09:31:53 +0000
Subject: Revert r194865 and r194874.

This change is incorrect. If you delete virtual destructor of both a base class
and a subclass, then the following code:
  Base *foo = new Child();
  delete foo;
will not cause the destructor for members of Child class. As a result, I observe
plently of memory leaks. Notable examples I investigated are:
ObjectBuffer and ObjectBufferStream, AttributeImpl and StringSAttributeImpl.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@194997 91177308-0d34-0410-b5e6-96231b3b80d8
---
 unittests/ADT/IntrusiveRefCntPtrTest.cpp               |  4 +---
 unittests/ExecutionEngine/MCJIT/MCJITCAPITest.cpp      | 18 ++++++++----------
 .../ExecutionEngine/MCJIT/MCJITMultipleModuleTest.cpp  |  8 +-------
 unittests/ExecutionEngine/MCJIT/MCJITTest.cpp          |  8 +++-----
 4 files changed, 13 insertions(+), 25 deletions(-)

(limited to 'unittests')

diff --git a/unittests/ADT/IntrusiveRefCntPtrTest.cpp b/unittests/ADT/IntrusiveRefCntPtrTest.cpp
index 2be5aaf..0c8c4ca 100644
--- a/unittests/ADT/IntrusiveRefCntPtrTest.cpp
+++ b/unittests/ADT/IntrusiveRefCntPtrTest.cpp
@@ -13,11 +13,9 @@
 namespace llvm {
 
 struct VirtualRefCounted : public RefCountedBaseVPTR {
-  virtual void f();
+  virtual void f() {}
 };
 
-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 e77fd36..e4197dd 100644
--- a/unittests/ExecutionEngine/MCJIT/MCJITCAPITest.cpp
+++ b/unittests/ExecutionEngine/MCJIT/MCJITCAPITest.cpp
@@ -83,8 +83,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);
@@ -151,14 +157,6 @@ protected:
   char *Error;
 };
 
-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 b01a854..4d650e8 100644
--- a/unittests/ExecutionEngine/MCJIT/MCJITMultipleModuleTest.cpp
+++ b/unittests/ExecutionEngine/MCJIT/MCJITMultipleModuleTest.cpp
@@ -18,13 +18,7 @@
 
 using namespace llvm;
 
-class MCJITMultipleModuleTest : public testing::Test,
-                                public MCJITTestBase {
-public:
-  virtual ~MCJITMultipleModuleTest();
-};
-
-MCJITMultipleModuleTest::~MCJITMultipleModuleTest() {}
+class MCJITMultipleModuleTest : public testing::Test, public MCJITTestBase {};
 
 namespace {
 
diff --git a/unittests/ExecutionEngine/MCJIT/MCJITTest.cpp b/unittests/ExecutionEngine/MCJIT/MCJITTest.cpp
index 3a86eb5..7ccd254 100644
--- a/unittests/ExecutionEngine/MCJIT/MCJITTest.cpp
+++ b/unittests/ExecutionEngine/MCJIT/MCJITTest.cpp
@@ -21,13 +21,11 @@ using namespace llvm;
 class MCJITTest : public testing::Test, public MCJITTestBase {
 protected:
 
-  virtual void SetUp();
+  virtual void SetUp() {
+    M.reset(createEmptyModule("<main>"));
+  }
 };
 
-void MCJITTest::SetUp() {
-  M.reset(createEmptyModule("<main>"));
-}
-
 namespace {
 
 // FIXME: Ensure creating an execution engine does not crash when constructed
-- 
cgit v1.1