commit 88368bae4cbf9cca6f8148e5397cf0cf805ebd57
author David Blaikie <dblaikie@gmail.com> Tue Apr 15 05:34:49 2014 +0000
committer David Blaikie <dblaikie@gmail.com> Tue Apr 15 05:34:49 2014 +0000
tree 668da32ea792d4e39bac18ebaaec42c8a169296f
parent f564ab62677c17775603465dbd7c1668d27bae20

Use unique_ptr to manage ownership of GCStrategy objects in GCMetadata

llvm-svn: 206246

llvm/lib/CodeGen/GCMetadata.cpp

diff --git a/llvm/lib/CodeGen/GCMetadata.cpp b/llvm/lib/CodeGen/GCMetadata.cpp
index c47450e..19f2186 100644
--- a/llvm/lib/CodeGen/GCMetadata.cpp
+++ b/llvm/lib/CodeGen/GCMetadata.cpp
@@ -61,10 +61,6 @@
   initializeGCModuleInfoPass(*PassRegistry::getPassRegistry());
 }
 
-GCModuleInfo::~GCModuleInfo() {
-  clear();
-}
-
 GCStrategy *GCModuleInfo::getOrCreateStrategy(const Module *M,
                                               const std::string &Name) {
   strategy_map_type::iterator NMI = StrategyMap.find(Name);
@@ -74,12 +70,12 @@
   for (GCRegistry::iterator I = GCRegistry::begin(),
                             E = GCRegistry::end(); I != E; ++I) {
     if (Name == I->getName()) {
-      GCStrategy *S = I->instantiate();
+      std::unique_ptr<GCStrategy> S(I->instantiate());
       S->M = M;
       S->Name = Name;
-      StrategyMap.GetOrCreateValue(Name).setValue(S);
-      StrategyList.push_back(S);
-      return S;
+      StrategyMap.GetOrCreateValue(Name).setValue(S.get());
+      StrategyList.push_back(std::move(S));
+      return StrategyList.back().get();
     }
   }
  
@@ -104,9 +100,6 @@
 void GCModuleInfo::clear() {
   FInfoMap.clear();
   StrategyMap.clear();
-  
-  for (iterator I = begin(), E = end(); I != E; ++I)
-    delete *I;
   StrategyList.clear();
 }