From 404a679e1d0c19bf504776fd10aaca411462da5e Mon Sep 17 00:00:00 2001 From: Mikael Holmen Date: Mon, 3 Jun 2019 06:38:01 +0000 Subject: [PATCH] [TableGen] Fix std::array initializer to avoid warnings with older tool chains. NFC A std::array is implemented as a template with an array inside a struct. Older versions of clang, like 3.6, require an extra set of curly braces around std::array initializations to avoid warnings. The C++ language was changed regarding this by CWG 1270. So more modern tool chains does not complain even if leaving out one level of braces. llvm-svn: 362360 --- llvm/utils/TableGen/DAGISelMatcherGen.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/llvm/utils/TableGen/DAGISelMatcherGen.cpp b/llvm/utils/TableGen/DAGISelMatcherGen.cpp index 3d3ae9c..1f0db4f 100644 --- a/llvm/utils/TableGen/DAGISelMatcherGen.cpp +++ b/llvm/utils/TableGen/DAGISelMatcherGen.cpp @@ -692,7 +692,7 @@ void MatcherGen::EmitResultLeafAsOperand(const TreePatternNode *N, } if (Def->getName() == "undef_tied_input") { - std::array ResultVTs = { N->getSimpleType(0) }; + std::array ResultVTs = {{ N->getSimpleType(0) }}; std::array InstOps; auto IDOperandNo = NextRecordedOperandNo++; AddMatcher(new EmitNodeMatcher("TargetOpcode::IMPLICIT_DEF", -- 2.7.4