From 84c4cc47f5fb52e680ca3f3790a7e15a3499731f Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Tue, 23 Aug 2016 22:21:58 +0000 Subject: [PATCH] Don't use "return {...}" to initialize a std::tuple. This has only been valid since 2015 (n4387), though it's allowed by a library DR so new implementations accept it in their C++11 modes... This should unbreak the build with libstdc++ 4.9. llvm-svn: 279583 --- llvm/lib/CodeGen/GlobalISel/MachineLegalizer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/llvm/lib/CodeGen/GlobalISel/MachineLegalizer.cpp b/llvm/lib/CodeGen/GlobalISel/MachineLegalizer.cpp index 6c00810..873288e 100644 --- a/llvm/lib/CodeGen/GlobalISel/MachineLegalizer.cpp +++ b/llvm/lib/CodeGen/GlobalISel/MachineLegalizer.cpp @@ -111,9 +111,9 @@ MachineLegalizer::getAction(const MachineInstr &MI) const { for (unsigned i = 0; i < MI.getNumTypes(); ++i) { auto Action = getAction({MI.getOpcode(), i, MI.getType(i)}); if (Action.first != Legal) - return {Action.first, i, Action.second}; + return std::make_tuple(Action.first, i, Action.second); } - return {Legal, 0, LLT{}}; + return std::make_tuple(Legal, 0, LLT{}); } bool MachineLegalizer::isLegal(const MachineInstr &MI) const { -- 2.7.4