From 9d13c903f708b48f93eb380bb05619d7e27abae4 Mon Sep 17 00:00:00 2001 From: Sanjoy Das Date: Fri, 29 Mar 2019 22:27:10 +0000 Subject: [PATCH] Try to fix buildbot error Error is: llvm/lib/Analysis/ScalarEvolution.cpp:3534:10: error: chosen constructor is explicit in copy-initialization return {UniqueSCEVs.FindNodeOrInsertPos(ID, IP), std::move(ID), IP}; ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /usr/bin/../lib/gcc/aarch64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple:479:19: note: explicit constructor declared here constexpr tuple(_UElements&&... __elements) ^ 1 error generated. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@357324 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Analysis/ScalarEvolution.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/Analysis/ScalarEvolution.cpp b/lib/Analysis/ScalarEvolution.cpp index fd759bd80fc..dff80fbb24d 100644 --- a/lib/Analysis/ScalarEvolution.cpp +++ b/lib/Analysis/ScalarEvolution.cpp @@ -3531,7 +3531,8 @@ ScalarEvolution::findExistingSCEVInCache(int SCEVType, ID.AddInteger(SCEVType); for (unsigned i = 0, e = Ops.size(); i != e; ++i) ID.AddPointer(Ops[i]); - return {UniqueSCEVs.FindNodeOrInsertPos(ID, IP), std::move(ID), IP}; + return std::tuple( + UniqueSCEVs.FindNodeOrInsertPos(ID, IP), std::move(ID), IP); } const SCEV * -- 2.50.1