Skip to content

Commit 93af370

Browse files
committed
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.
1 parent 60bcec4 commit 93af370

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

llvm/lib/CodeGen/LiveDebugValues/InstrRefBasedImpl.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2347,7 +2347,7 @@ std::tuple<Optional<ValueIDNum>, bool> InstrRefBasedLDV::pickVPHILoc(
23472347

23482348
// If there were no locations at all, return an empty result.
23492349
if (Locs.empty())
2350-
return {None, false};
2350+
return std::tuple<Optional<ValueIDNum>, bool>(None, false);
23512351

23522352
// Lambda for seeking a common location within a range of location-sets.
23532353
typedef SmallVector<SmallVector<LocIdx, 4>, 8>::iterator LocsIt;
@@ -2382,12 +2382,12 @@ std::tuple<Optional<ValueIDNum>, bool> InstrRefBasedLDV::pickVPHILoc(
23822382
}
23832383

23842384
if (!TheLoc)
2385-
return {None, false};
2385+
return std::tuple<Optional<ValueIDNum>, bool>(None, false);
23862386

23872387
// Return a PHI-value-number for the found location.
23882388
LocIdx L = *TheLoc;
23892389
ValueIDNum PHIVal = {(unsigned)MBB.getNumber(), 0, L};
2390-
return {PHIVal, ValidForAllLocs};
2390+
return std::tuple<Optional<ValueIDNum>, bool>(PHIVal, ValidForAllLocs);
23912391
}
23922392

23932393
std::tuple<bool, bool> InstrRefBasedLDV::vlocJoin(

0 commit comments

Comments
 (0)