From: James Molloy <jmolloy@google.com>
Date: Mon, 7 Oct 2019 08:23:20 +0000 (+0000)
Subject: [TableGen] Pacify gcc-5.4 more
X-Git-Tag: llvmorg-11-init~7371
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=beb696e2a68c4715fb21f282f83be8590979d112;p=platform%2Fupstream%2Fllvm.git

[TableGen] Pacify gcc-5.4 more

Followup to a previous pacification, this performs the same workaround
to the TableGen generated code for tuple automata.

llvm-svn: 373883
---

diff --git a/llvm/utils/TableGen/DFAEmitter.cpp b/llvm/utils/TableGen/DFAEmitter.cpp
index cf339dc..dd3db7c 100644
--- a/llvm/utils/TableGen/DFAEmitter.cpp
+++ b/llvm/utils/TableGen/DFAEmitter.cpp
@@ -373,7 +373,7 @@ void CustomDfaEmitter::printActionType(raw_ostream &OS) { OS << TypeName; }
 void CustomDfaEmitter::printActionValue(action_type A, raw_ostream &OS) {
   const ActionTuple &AT = Actions[A];
   if (AT.size() > 1)
-    OS << "{";
+    OS << "std::make_tuple(";
   bool First = true;
   for (const auto &SingleAction : AT) {
     if (!First)
@@ -382,7 +382,7 @@ void CustomDfaEmitter::printActionValue(action_type A, raw_ostream &OS) {
     SingleAction.print(OS);
   }
   if (AT.size() > 1)
-    OS << "}";
+    OS << ")";
 }
 
 namespace llvm {