From beb696e2a68c4715fb21f282f83be8590979d112 Mon Sep 17 00:00:00 2001 From: James Molloy Date: Mon, 7 Oct 2019 08:23:20 +0000 Subject: [PATCH] [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 --- llvm/utils/TableGen/DFAEmitter.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 { -- 2.7.4