From: Sanjoy Das Date: Fri, 29 Mar 2019 22:27:10 +0000 (+0000) Subject: Try to fix buildbot error X-Git-Tag: llvmorg-10-init~8835 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=53a5952a9318c410964e1ca38737e8a28c015eea;p=platform%2Fupstream%2Fllvm.git 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. llvm-svn: 357324 --- diff --git a/llvm/lib/Analysis/ScalarEvolution.cpp b/llvm/lib/Analysis/ScalarEvolution.cpp index fd759bd..dff80fb 100644 --- a/llvm/lib/Analysis/ScalarEvolution.cpp +++ b/llvm/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 *