From: Benjamin Kramer <benny.kra@googlemail.com>
Date: Tue, 28 Jan 2020 23:25:44 +0000 (+0100)
Subject: [tblgen] Fix implicit conversion only diagnosed by g++ 6
X-Git-Tag: llvmorg-12-init~16548
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=05c19705d8edc05cc85cfef3b4e2cd172fc873a8;p=platform%2Fupstream%2Fllvm.git

[tblgen] Fix implicit conversion only diagnosed by g++ 6
---

diff --git a/llvm/include/llvm/TableGen/Record.h b/llvm/include/llvm/TableGen/Record.h
index 041156e..6667afe 100644
--- a/llvm/include/llvm/TableGen/Record.h
+++ b/llvm/include/llvm/TableGen/Record.h
@@ -1726,21 +1726,21 @@ public:
   }
 
   void addClass(std::unique_ptr<Record> R) {
-    bool Ins = Classes.insert(std::make_pair(R->getName(),
+    bool Ins = Classes.insert(std::make_pair(std::string(R->getName()),
                                              std::move(R))).second;
     (void)Ins;
     assert(Ins && "Class already exists");
   }
 
   void addDef(std::unique_ptr<Record> R) {
-    bool Ins = Defs.insert(std::make_pair(R->getName(),
+    bool Ins = Defs.insert(std::make_pair(std::string(R->getName()),
                                           std::move(R))).second;
     (void)Ins;
     assert(Ins && "Record already exists");
   }
 
   void addExtraGlobal(StringRef Name, Init *I) {
-    bool Ins = ExtraGlobals.insert(std::make_pair(Name, I)).second;
+    bool Ins = ExtraGlobals.insert(std::make_pair(std::string(Name), I)).second;
     (void)Ins;
     assert(!getDef(Name));
     assert(Ins && "Global already exists");