Skip to content

Commit

Permalink
Follow-up build fix for rGae6f78824031
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
jmorse committed Aug 22, 2020
1 parent 60bcec4 commit 93af370
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions llvm/lib/CodeGen/LiveDebugValues/InstrRefBasedImpl.cpp
Expand Up @@ -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;
Expand Down Expand Up @@ -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(
Expand Down

0 comments on commit 93af370

Please sign in to comment.