commit 3575b5479af54e471ea6750a8585e2c9bc87801c
author Peter Kasting <pkasting@chromium.org> Wed Feb 22 13:54:40 2023 -0800
committer swiftshader-scoped@luci-project-accounts.iam.gserviceaccount.com <swiftshader-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Feb 23 02:57:56 2023 +0000
tree 641411429a1dffe53bee23ad77fcd3e06660fa51
parent 64eb04027b9fe31f548fad878cdcf9d5926f042a

Yet more C++20 build fixes.

Most were taken from a couple of upstream commites, but the change to
lib/IR/DebugInfo.cpp is my own (since upstream changed significantly
before starting to build with C++20).

Bug: chromium:1284275
Change-Id: Ib8d88849d85d62c6c54d0ae448acfa3e980617cd
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/70828
Commit-Queue: Peter Kasting <pkasting@google.com>
Tested-by: Peter Kasting <pkasting@google.com>
Reviewed-by: Shahbaz Youssefi <syoussefi@google.com>
Kokoro-Result: kokoro <noreply+kokoro@google.com>

third_party/llvm-10.0/llvm/include/llvm/ProfileData/InstrProfReader.h

diff --git a/third_party/llvm-10.0/llvm/include/llvm/ProfileData/InstrProfReader.h b/third_party/llvm-10.0/llvm/include/llvm/ProfileData/InstrProfReader.h
index f5f5526..e80cac2 100644
--- a/third_party/llvm-10.0/llvm/include/llvm/ProfileData/InstrProfReader.h
+++ b/third_party/llvm-10.0/llvm/include/llvm/ProfileData/InstrProfReader.h
@@ -50,8 +50,12 @@
   InstrProfIterator(InstrProfReader *Reader) : Reader(Reader) { Increment(); }
 
   InstrProfIterator &operator++() { Increment(); return *this; }
-  bool operator==(const InstrProfIterator &RHS) { return Reader == RHS.Reader; }
-  bool operator!=(const InstrProfIterator &RHS) { return Reader != RHS.Reader; }
+  bool operator==(const InstrProfIterator &RHS) const {
+    return Reader == RHS.Reader;
+  }
+  bool operator!=(const InstrProfIterator &RHS) const {
+    return Reader != RHS.Reader;
+  }
   value_type &operator*() { return Record; }
   value_type *operator->() { return &Record; }
 };

third_party/llvm-10.0/llvm/include/llvm/Transforms/IPO/Attributor.h

diff --git a/third_party/llvm-10.0/llvm/include/llvm/Transforms/IPO/Attributor.h b/third_party/llvm-10.0/llvm/include/llvm/Transforms/IPO/Attributor.h
index f7430a8..87760eb 100644
--- a/third_party/llvm-10.0/llvm/include/llvm/Transforms/IPO/Attributor.h
+++ b/third_party/llvm-10.0/llvm/include/llvm/Transforms/IPO/Attributor.h
@@ -2206,13 +2206,13 @@
   }
 
   /// Equality for DerefState.
-  bool operator==(const DerefState &R) {
+  bool operator==(const DerefState &R) const {
     return this->DerefBytesState == R.DerefBytesState &&
            this->GlobalState == R.GlobalState;
   }
 
   /// Inequality for DerefState.
-  bool operator!=(const DerefState &R) { return !(*this == R); }
+  bool operator!=(const DerefState &R) const { return !(*this == R); }
 
   /// See IntegerStateBase::operator^=
   DerefState operator^=(const DerefState &R) {

third_party/llvm-10.0/llvm/lib/IR/DebugInfo.cpp

diff --git a/third_party/llvm-10.0/llvm/lib/IR/DebugInfo.cpp b/third_party/llvm-10.0/llvm/lib/IR/DebugInfo.cpp
index fe83119..6a30ceb 100644
--- a/third_party/llvm-10.0/llvm/lib/IR/DebugInfo.cpp
+++ b/third_party/llvm-10.0/llvm/lib/IR/DebugInfo.cpp
@@ -655,7 +655,7 @@
           if (auto *T = dyn_cast_or_null<MDTuple>(Attachment.second))
             for (unsigned N = 0; N < T->getNumOperands(); ++N)
               if (auto *Loc = dyn_cast_or_null<DILocation>(T->getOperand(N)))
-                if (Loc != DebugLoc())
+                if (Loc != DebugLoc().get())
                   T->replaceOperandWith(N, remapDebugLoc(Loc));
       }
     }

third_party/llvm-10.0/llvm/lib/Transforms/Scalar/GVNHoist.cpp

diff --git a/third_party/llvm-10.0/llvm/lib/Transforms/Scalar/GVNHoist.cpp b/third_party/llvm-10.0/llvm/lib/Transforms/Scalar/GVNHoist.cpp
index e1796f6..a2680f1 100644
--- a/third_party/llvm-10.0/llvm/lib/Transforms/Scalar/GVNHoist.cpp
+++ b/third_party/llvm-10.0/llvm/lib/Transforms/Scalar/GVNHoist.cpp
@@ -149,8 +149,8 @@
   // The instruction (VN) which uses the values flowing out of CHI.
   Instruction *I;
 
-  bool operator==(const CHIArg &A) { return VN == A.VN; }
-  bool operator!=(const CHIArg &A) { return !(*this == A); }
+  bool operator==(const CHIArg &A) const { return VN == A.VN; }
+  bool operator!=(const CHIArg &A) const { return !(*this == A); }
 };
 
 using CHIIt = SmallVectorImpl<CHIArg>::iterator;