From: Jeremy Morse <jeremy.morse@sony.com>
Date: Sat, 22 Aug 2020 18:05:25 +0000 (+0100)
Subject: Follow-up build fix for rGae6f78824031
X-Git-Tag: llvmorg-13-init~13993
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=93af37043b9c1a8ea47890ad2bcf277f9b36c47d;p=platform%2Fupstream%2Fllvm.git

Follow-up build fix for rGae6f78824031

One of the bots objects to brace-initializing a tuple:

  http://lab.llvm.org:8011/builders/clang-cmake-x86_64-sde-avx512-linux/builds/43595/steps/build%20stage%201/logs/stdio

As the tuple constructor is apparently explicit. Fall back to the (not
as pretty) explicit construction of a tuple. I'd thought this was
permitted behaviour; will investigate why this fails later.
---

diff --git a/llvm/lib/CodeGen/LiveDebugValues/InstrRefBasedImpl.cpp b/llvm/lib/CodeGen/LiveDebugValues/InstrRefBasedImpl.cpp
index 25f474c..a0e85c8 100644
--- a/llvm/lib/CodeGen/LiveDebugValues/InstrRefBasedImpl.cpp
+++ b/llvm/lib/CodeGen/LiveDebugValues/InstrRefBasedImpl.cpp
@@ -2347,7 +2347,7 @@ std::tuple<Optional<ValueIDNum>, bool> InstrRefBasedLDV::pickVPHILoc(
 
   // If there were no locations at all, return an empty result.
   if (Locs.empty())
-    return {None, false};
+    return std::tuple<Optional<ValueIDNum>, bool>(None, false);
 
   // Lambda for seeking a common location within a range of location-sets.
   typedef SmallVector<SmallVector<LocIdx, 4>, 8>::iterator LocsIt;
@@ -2382,12 +2382,12 @@ std::tuple<Optional<ValueIDNum>, bool> InstrRefBasedLDV::pickVPHILoc(
   }
 
   if (!TheLoc)
-    return {None, false};
+    return std::tuple<Optional<ValueIDNum>, bool>(None, false);
 
   // Return a PHI-value-number for the found location.
   LocIdx L = *TheLoc;
   ValueIDNum PHIVal = {(unsigned)MBB.getNumber(), 0, L};
-  return {PHIVal, ValidForAllLocs};
+  return std::tuple<Optional<ValueIDNum>, bool>(PHIVal, ValidForAllLocs);
 }
 
 std::tuple<bool, bool> InstrRefBasedLDV::vlocJoin(