[llvm] r345712 - [ADT] Remove illegal comparison of singular iterators from SmallSetTest

Florian Hahn via llvm-commits llvm-commits at lists.llvm.org
Wed Oct 31 04:00:49 PDT 2018


Author: fhahn
Date: Wed Oct 31 04:00:48 2018
New Revision: 345712

URL: http://llvm.org/viewvc/llvm-project?rev=345712&view=rev
Log:
[ADT] Remove illegal comparison of singular iterators from SmallSetTest

This removes the assertion that a copy of a moved-from SmallSetIterator
equals the original, which is illegal due to SmallSetIterator including
an instance of a standard `std::set` iterator.

C++ [iterator.requirements.general] states that comparing singular
iterators has undefined result:

> Iterators can also have singular values that are not associated with
> any sequence. [...] Results of most expressions are undefined for
> singular values; the only exceptions are destroying an iterator that
> holds a singular value, the assignment of a non-singular value to an
> iterator that holds a singular value, and, for iterators that satisfy
> the Cpp17DefaultConstructible requirements, using a value-initialized
> iterator as the source of a copy or move operation.

This assertion triggers the following error in the GNU C++ Library in
debug mode under EXPENSIVE_CHECKS:

  /usr/include/c++/8.2.1/debug/safe_iterator.h:518:
  Error: attempt to compare a singular iterator to a singular iterator.

  Objects involved in the operation:
      iterator "lhs" @ 0x0x7fff86420670 {
        state = singular;
      }
      iterator "rhs" @ 0x0x7fff86420640 {
        state = singular;
      }

Patch by Eugene Sharygin.

Reviewers: fhahn, dblaikie, chandlerc

Reviewed By: fhahn, dblaikie

Differential Revision: https://reviews.llvm.org/D53793

Modified:
    llvm/trunk/unittests/ADT/SmallSetTest.cpp

Modified: llvm/trunk/unittests/ADT/SmallSetTest.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/ADT/SmallSetTest.cpp?rev=345712&r1=345711&r2=345712&view=diff
==============================================================================
--- llvm/trunk/unittests/ADT/SmallSetTest.cpp (original)
+++ llvm/trunk/unittests/ADT/SmallSetTest.cpp Wed Oct 31 04:00:48 2018
@@ -142,8 +142,4 @@ TEST(SmallSetTest, IteratorIncMoveCopy)
   auto Iter2 = s1.begin();
   Iter = std::move(Iter2);
   EXPECT_EQ("str 0", *Iter);
-
-  auto Iter3 = s1.end();
-  Iter3 = Iter2;
-  EXPECT_EQ(Iter3, Iter2);
 }




More information about the llvm-commits mailing list