summaryrefslogtreecommitdiffstats
path: root/llvm/lib
diff options
context:
space:
mode:
authorRichard Smith <richard-llvm@metafoo.co.uk>2016-08-23 22:21:58 +0000
committerRichard Smith <richard-llvm@metafoo.co.uk>2016-08-23 22:21:58 +0000
commit84c4cc47f5fb52e680ca3f3790a7e15a3499731f (patch)
tree7a2bfbfd0c3fc8d9b805c76664b8e4543e5967c9 /llvm/lib
parent418237bed8e7372930f0a2491af2ba8c68f032be (diff)
downloadbcm5719-llvm-84c4cc47f5fb52e680ca3f3790a7e15a3499731f.tar.gz
bcm5719-llvm-84c4cc47f5fb52e680ca3f3790a7e15a3499731f.zip
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
Diffstat (limited to 'llvm/lib')
-rw-r--r--llvm/lib/CodeGen/GlobalISel/MachineLegalizer.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/CodeGen/GlobalISel/MachineLegalizer.cpp b/llvm/lib/CodeGen/GlobalISel/MachineLegalizer.cpp
index 6c00810fb68..873288ee42c 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 {
OpenPOWER on IntegriCloud