Replace std::map<K, V*> with std::map<K, V> to handle ownership and deletion of the...

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@222957 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/TableGen/TGParser.cpp b/lib/TableGen/TGParser.cpp
index 8761726d12e3e9ac72a76167afa14c643ca7eccf..b17e8607e7f6a1ed32d0500c04d675047305d2ea 100644 (file)
--- a/lib/TableGen/TGParser.cpp
+++ b/lib/TableGen/TGParser.cpp
@@ -459,12 +459,12 @@ MultiClass *TGParser::ParseMultiClassID() {
     return nullptr;
   }
 
-  MultiClass *Result = MultiClasses[Lex.getCurStrVal()];
-  if (!Result)
+  auto it = MultiClasses.find(Lex.getCurStrVal());
+  if (it == MultiClasses.end())
     TokError("Couldn't find multiclass '" + Lex.getCurStrVal() + "'");
 
   Lex.Lex();
-  return Result;
+  return &it->second;
 }
 
 /// ParseSubClassReference - Parse a reference to a subclass or to a templated
@@ -2290,11 +2290,13 @@ bool TGParser::ParseMultiClass() {
     return TokError("expected identifier after multiclass for name");
   std::string Name = Lex.getCurStrVal();
 
-  if (MultiClasses.count(Name))
+  auto Result =
+    MultiClasses.insert(std::make_pair(Name,
+                                       MultiClass(Name, Lex.getLoc(),Records)));
+  if (!Result.second)
     return TokError("multiclass '" + Name + "' already defined");
+  CurMultiClass = &Result.first->second;
 
-  CurMultiClass = MultiClasses[Name] = new MultiClass(Name, 
-                                                      Lex.getLoc(), Records);
   Lex.Lex();  // Eat the identifier.
 
   // If there are template args, parse them.
@@ -2555,8 +2557,9 @@ bool TGParser::ParseDefm(MultiClass *CurMultiClass) {
     // To instantiate a multiclass, we need to first get the multiclass, then
     // instantiate each def contained in the multiclass with the SubClassRef
     // template parameters.
-    MultiClass *MC = MultiClasses[Ref.Rec->getName()];
-    assert(MC && "Didn't lookup multiclass correctly?");
+    auto it = MultiClasses.find(Ref.Rec->getName());
+    assert(it != MultiClasses.end() && "Didn't lookup multiclass correctly?");
+    MultiClass *MC = &it->second;
     std::vector<Init*> &TemplateVals = Ref.TemplateArgs;
 
     // Verify that the correct number of template arguments were specified.

diff --git a/lib/TableGen/TGParser.h b/lib/TableGen/TGParser.h
index 79994cbc1a6dbf2b8ee38f5480c0c728444b8a9a..45f418ab344e45936f514863315cba610b9fcc10 100644 (file)
--- a/lib/TableGen/TGParser.h
+++ b/lib/TableGen/TGParser.h
@@ -55,7 +55,7 @@ namespace llvm {
 class TGParser {
   TGLexer Lex;
   std::vector<std::vector<LetRecord> > LetStack;
-  std::map<std::string, MultiClass*> MultiClasses;
+  std::map<std::string, MultiClass> MultiClasses;
 
   /// Loops - Keep track of any foreach loops we are within.
   ///