]> granicus.if.org Git - llvm/commitdiff
Try to fix buildbot error
authorSanjoy Das <sanjoy@playingwithpointers.com>
Fri, 29 Mar 2019 22:27:10 +0000 (22:27 +0000)
committerSanjoy Das <sanjoy@playingwithpointers.com>
Fri, 29 Mar 2019 22:27:10 +0000 (22:27 +0000)
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

index fd759bd80fc2d82f20850bfb2f44cf5b90bc7c1e..dff80fbb24d4175aaae5edc47ffc90bed0385113 100644 (file)
@@ -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<const SCEV *, FoldingSetNodeID, void *>(
+      UniqueSCEVs.FindNodeOrInsertPos(ID, IP), std::move(ID), IP);
 }
 
 const SCEV *