Backport fix for C++23 incompatibility in llvm
LiveInterval.h no longer builds with the latest Clang on Chromium
(https://crbug.com/1316640#c4) because of a backwards-incompatible
change in C++23 introduced in https://reviews.llvm.org/D119136. To fix
this this CL backports
https://reviews.llvm.org/rGd8d793f29b40767925578f721b35fba352d8296c to
SwiftShader's copy of llvm.
Change-Id: I543fa54441783116746b5dc7c1d0d4d38914cf38
Bug: chromium:1316640
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/65128
Kokoro-Result: kokoro <noreply+kokoro@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Commit-Queue: Nicolas Capens <nicolascapens@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>
diff --git a/third_party/llvm-10.0/llvm/include/llvm/CodeGen/LiveInterval.h b/third_party/llvm-10.0/llvm/include/llvm/CodeGen/LiveInterval.h
index fe5adb5..85bd1a2 100644
--- a/third_party/llvm-10.0/llvm/include/llvm/CodeGen/LiveInterval.h
+++ b/third_party/llvm-10.0/llvm/include/llvm/CodeGen/LiveInterval.h
@@ -625,11 +625,10 @@
// if the Seg is lower find first segment that is above Idx using binary
// search
if (Seg->end <= *Idx) {
- Seg = std::upper_bound(++Seg, EndSeg, *Idx,
- [=](typename std::remove_reference<decltype(*Idx)>::type V,
- const typename std::remove_reference<decltype(*Seg)>::type &S) {
- return V < S.end;
- });
+ Seg =
+ std::upper_bound(++Seg, EndSeg, *Idx, [=](auto V, const auto &S) {
+ return V < S.end;
+ });
if (Seg == EndSeg)
break;
}
