[llvm] r223997 - Replace std::map<K, V*> with std::map<K, std::unique_ptr<V>> to handle ownership and deletion of the values.

[David Blaikie]

On Wed, Dec 10, 2014 at 9:25 PM, Craig Topper <craig.topper at gmail.com>
wrote:

> Author: ctopper
> Date: Wed Dec 10 23:25:30 2014
> New Revision: 223997
>
> URL: http://llvm.org/viewvc/llvm-project?rev=223997&view=rev
> Log:
> Replace std::map<K, V*> with std::map<K, std::unique_ptr<V>> to handle
> ownership and deletion of the values.
>
> Ideally we would store the MultiClasses by value directly in the maps, but
> I had some trouble with that before


Might be worth documenting the troubles at least in the commit message (or
in this thread) and possibly in a comment in the code so the next time
someone thinks "this could be simpler" they'll know what to look out for.


> and this at least fixes the leak.
>
> Modified:
>     llvm/trunk/lib/TableGen/TGParser.cpp
>     llvm/trunk/lib/TableGen/TGParser.h
>
> Modified: llvm/trunk/lib/TableGen/TGParser.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/TableGen/TGParser.cpp?rev=223997&r1=223996&r2=223997&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/TableGen/TGParser.cpp (original)
> +++ llvm/trunk/lib/TableGen/TGParser.cpp Wed Dec 10 23:25:30 2014
> @@ -459,7 +459,7 @@ MultiClass *TGParser::ParseMultiClassID(
>      return nullptr;
>    }
>
> -  MultiClass *Result = MultiClasses[Lex.getCurStrVal()];
> +  MultiClass *Result = MultiClasses[Lex.getCurStrVal()].get();
>    if (!Result)
>      TokError("Couldn't find multiclass '" + Lex.getCurStrVal() + "'");
>
> @@ -2290,11 +2290,14 @@ 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,
> +                    llvm::make_unique<MultiClass>(Name,
> Lex.getLoc(),Records)));
> +
> +  if (!Result.second)
>      return TokError("multiclass '" + Name + "' already defined");
>
> -  CurMultiClass = MultiClasses[Name] = new MultiClass(Name,
> -                                                      Lex.getLoc(),
> Records);
> +  CurMultiClass = Result.first->second.get();
>    Lex.Lex();  // Eat the identifier.
>
>    // If there are template args, parse them.
> @@ -2555,7 +2558,7 @@ bool TGParser::ParseDefm(MultiClass *Cur
>      // 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()];
> +    MultiClass *MC = MultiClasses[Ref.Rec->getName()].get();
>      assert(MC && "Didn't lookup multiclass correctly?");
>      std::vector<Init*> &TemplateVals = Ref.TemplateArgs;
>
>
> Modified: llvm/trunk/lib/TableGen/TGParser.h
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/TableGen/TGParser.h?rev=223997&r1=223996&r2=223997&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/TableGen/TGParser.h (original)
> +++ llvm/trunk/lib/TableGen/TGParser.h Wed Dec 10 23:25:30 2014
> @@ -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, std::unique_ptr<MultiClass>> MultiClasses;
>
>    /// Loops - Keep track of any foreach loops we are within.
>    ///
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20141210/f7fbfada/attachment.html>