commit bb053164413d86d0e7b354dec68f521c073ff4c4
author Matthias Braun <matze@braunis.de> Mon Dec 05 06:00:46 2016 +0000
committer Matthias Braun <matze@braunis.de> Mon Dec 05 06:00:46 2016 +0000
tree 9d9d46fb86555ab502ccf0f478ceb2edc6cb1716
parent 7cf3b112248267e517758894ab8e6333792aea60

TableGen: Use StringInit instead of std::string for DagInit arg names

llvm-svn: 288644

llvm/lib/TableGen/Record.cpp

diff --git a/llvm/lib/TableGen/Record.cpp b/llvm/lib/TableGen/Record.cpp
index 2744d4f..2875375 100644
--- a/llvm/lib/TableGen/Record.cpp
+++ b/llvm/lib/TableGen/Record.cpp
@@ -829,7 +829,7 @@
       if (!LOp || !ROp || LOp->getDef() != ROp->getDef())
         PrintFatalError("Concated Dag operators do not match!");
       std::vector<Init*> Args;
-      std::vector<std::string> ArgNames;
+      std::vector<StringInit*> ArgNames;
       for (unsigned i = 0, e = LHSs->getNumArgs(); i != e; ++i) {
         Args.push_back(LHSs->getArg(i));
         ArgNames.push_back(LHSs->getArgName(i));
@@ -1021,10 +1021,10 @@
                                          Type, CurRec, CurMultiClass))
       Val = Result;
 
-    std::vector<std::pair<Init *, std::string> > args;
+    std::vector<std::pair<Init *, StringInit*> > args;
     for (unsigned int i = 0; i < MHSd->getNumArgs(); ++i) {
       Init *Arg = MHSd->getArg(i);
-      std::string ArgName = MHSd->getArgName(i);
+      StringInit *ArgName = MHSd->getArgName(i);
 
       // Process args
       if (Init *Result = EvaluateOperation(RHSo, LHS, Arg, Type,
@@ -1525,23 +1525,23 @@
 
 static void ProfileDagInit(FoldingSetNodeID &ID, Init *V, StringInit *VN,
                            ArrayRef<Init *> ArgRange,
-                           ArrayRef<std::string> NameRange) {
+                           ArrayRef<StringInit *> NameRange) {
   ID.AddPointer(V);
   ID.AddPointer(VN);
 
-  ArrayRef<Init *>::iterator Arg  = ArgRange.begin();
-  ArrayRef<std::string>::iterator  Name = NameRange.begin();
+  ArrayRef<Init *>::iterator Arg = ArgRange.begin();
+  ArrayRef<StringInit *>::iterator Name = NameRange.begin();
   while (Arg != ArgRange.end()) {
     assert(Name != NameRange.end() && "Arg name underflow!");
     ID.AddPointer(*Arg++);
-    ID.AddString(*Name++);
+    ID.AddPointer(*Name++);
   }
   assert(Name == NameRange.end() && "Arg name overflow!");
 }
 
 DagInit *
 DagInit::get(Init *V, StringInit *VN, ArrayRef<Init *> ArgRange,
-             ArrayRef<std::string> NameRange) {
+             ArrayRef<StringInit *> NameRange) {
   static FoldingSet<DagInit> ThePool;
   static std::vector<DagInit*> TheActualPool;
 
@@ -1560,9 +1560,9 @@
 
 DagInit *
 DagInit::get(Init *V, StringInit *VN,
-             const std::vector<std::pair<Init*, std::string> > &args) {
+             const std::vector<std::pair<Init*, StringInit*> > &args) {
   std::vector<Init *> Args;
-  std::vector<std::string> Names;
+  std::vector<StringInit *> Names;
 
   for (const auto &Arg : args) {
     Args.push_back(Arg.first);
@@ -1602,10 +1602,10 @@
     Result += ":" + ValName->getAsUnquotedString();
   if (!Args.empty()) {
     Result += " " + Args[0]->getAsString();
-    if (!ArgNames[0].empty()) Result += ":$" + ArgNames[0];
+    if (ArgNames[0]) Result += ":$" + ArgNames[0]->getAsUnquotedString();
     for (unsigned i = 1, e = Args.size(); i != e; ++i) {
       Result += ", " + Args[i]->getAsString();
-      if (!ArgNames[i].empty()) Result += ":$" + ArgNames[i];
+      if (ArgNames[i]) Result += ":$" + ArgNames[i]->getAsUnquotedString();
     }
   }
   return Result + ")";