[PATCH] D78919: Changing DenseMapIterator's comparisons to be hidden friends.

[Barry Revzin via Phabricator via llvm-commits]

BRevzin created this revision.
Herald added subscribers: llvm-commits, dexonsmith.
Herald added a project: LLVM.
BRevzin edited the summary of this revision.

The existing implementation breaks in C++20 (sorry, see this StackOverflow answer <https://stackoverflow.com/a/61448147/2069064>), the new implementation works fine under all language versions.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D78919

Files:
  llvm/include/llvm/ADT/DenseMap.h


Index: llvm/include/llvm/ADT/DenseMap.h
===================================================================
--- llvm/include/llvm/ADT/DenseMap.h
+++ llvm/include/llvm/ADT/DenseMap.h
@@ -1244,19 +1244,18 @@
     return Ptr;
   }
 
-  bool operator==(const ConstIterator &RHS) const {
-    assert((!Ptr || isHandleInSync()) && "handle not in sync!");
+  friend bool operator==(const DenseMapIterator &LHS,
+                         const DenseMapIterator &RHS) {
+    assert((!LHS.Ptr || LHS.isHandleInSync()) && "handle not in sync!");
     assert((!RHS.Ptr || RHS.isHandleInSync()) && "handle not in sync!");
-    assert(getEpochAddress() == RHS.getEpochAddress() &&
+    assert(LHS.getEpochAddress() == RHS.getEpochAddress() &&
            "comparing incomparable iterators!");
-    return Ptr == RHS.Ptr;
+    return LHS.Ptr == RHS.Ptr;
   }
-  bool operator!=(const ConstIterator &RHS) const {
-    assert((!Ptr || isHandleInSync()) && "handle not in sync!");
-    assert((!RHS.Ptr || RHS.isHandleInSync()) && "handle not in sync!");
-    assert(getEpochAddress() == RHS.getEpochAddress() &&
-           "comparing incomparable iterators!");
-    return Ptr != RHS.Ptr;
+
+  friend bool operator!=(const DenseMapIterator &LHS,
+                         const DenseMapIterator &RHS) {
+    return !(LHS == RHS);
   }
 
   inline DenseMapIterator& operator++() {  // Preincrement


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D78919.260290.patch
Type: text/x-patch
Size: 1381 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200427/edab4d23/attachment.bin>