[llvm] r279583 - Don't use "return {...}" to initialize a std::tuple. This has only been valid

Richard Smith via llvm-commits llvm-commits at lists.llvm.org
Tue Aug 23 15:21:58 PDT 2016


Author: rsmith
Date: Tue Aug 23 17:21:58 2016
New Revision: 279583

URL: http://llvm.org/viewvc/llvm-project?rev=279583&view=rev
Log:
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.

Modified:
    llvm/trunk/lib/CodeGen/GlobalISel/MachineLegalizer.cpp

Modified: llvm/trunk/lib/CodeGen/GlobalISel/MachineLegalizer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/GlobalISel/MachineLegalizer.cpp?rev=279583&r1=279582&r2=279583&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/GlobalISel/MachineLegalizer.cpp (original)
+++ llvm/trunk/lib/CodeGen/GlobalISel/MachineLegalizer.cpp Tue Aug 23 17:21:58 2016
@@ -111,9 +111,9 @@ MachineLegalizer::getAction(const Machin
   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 {




More information about the llvm-commits mailing list