Skip to content

Commit

Permalink
[unittests] ADT: silence -Wself-assign diagnostics
Browse files Browse the repository at this point in the history
Summary:
D44883 extends -Wself-assign to also work on C++ classes.
In it's current state (as suggested by @rjmccall), it is not under it's own sub-group.
Since that diag is enabled by `-Wall`, stage2 testing showed that:
* It does not fire on any llvm code
* It does fire for these 3 unittests
* It does fire for libc++ tests

This diff simply silences those new warnings in llvm's unittests.
A similar diff will be needed for libcxx. (`libcxx/test/std/language.support/support.types/byteops/`, maybe something else)

Since i don't think we want to repeat rL322901, let's talk about it.
I've subscribed everyone who i think might be interested...

There are several ways forward:
* Not extend -Wself-assign, close D44883. Not very productive outcome i'd say.
* Keep D44883 in it's current state.
  Unless your custom overloaded operators do something unusual for when self-assigning,
  the warning is no less of a false-positive than the current -Wself-assign.
  Except for tests of course, there you'd want to silence it. The current suggestion is:
  ```
  S a;
  a = (S &)a;
  ```
* Split the diagnostic in two - `-Wself-assign-builtin` (i.e. what is `-Wself-assign` in trunk),
  and `-Wself-assign-overloaded` - the new part in D44883.
  Since, as i said, i'm not really sure why it would be less of a error than the current `-Wself-assign`,
  both would still be in `-Wall`. That way one could simply pass `-Wno-self-assign-overloaded` for all the tests.
  Pretty simple to do, and will surely work.
* Split the diagnostic in two - `-Wself-assign-trivial`, and `-Wself-assign-nontrivial`.
  The choice of which diag to emit would depend on trivial-ness of that particular operator.
  The current `-Wself-assign` would be `-Wself-assign-trivial`.
  https://godbolt.org/g/gwDASe - `A`, `B` and `C` case would be treated as trivial, and `D`, `E` and `F` as non-trivial.
  Will be the most complicated to implement.

Thoughts?

Reviewers: aaron.ballman, rsmith, rtrieu, rjmccall, dblaikie, atrick, gottesmm

Reviewed By: dblaikie

Subscribers: lebedev.ri, phosek, vsk, rnk, thakis, sammccall, mclow.lists, llvm-commits, rjmccall

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

llvm-svn: 329491
  • Loading branch information
LebedevRI committed Apr 7, 2018
1 parent 6669e59 commit 429b003
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions llvm/unittests/ADT/DenseMapTest.cpp
Expand Up @@ -247,7 +247,7 @@ TYPED_TEST(DenseMapTest, AssignmentTest) {
EXPECT_EQ(this->getValue(), copyMap[this->getKey()]);

// test self-assignment.
copyMap = copyMap;
copyMap = static_cast<TypeParam &>(copyMap);
EXPECT_EQ(1u, copyMap.size());
EXPECT_EQ(this->getValue(), copyMap[this->getKey()]);
}
Expand All @@ -262,7 +262,7 @@ TYPED_TEST(DenseMapTest, AssignmentTestNotSmall) {
EXPECT_EQ(this->getValue(Key), copyMap[this->getKey(Key)]);

// test self-assignment.
copyMap = copyMap;
copyMap = static_cast<TypeParam &>(copyMap);
EXPECT_EQ(5u, copyMap.size());
for (int Key = 0; Key < 5; ++Key)
EXPECT_EQ(this->getValue(Key), copyMap[this->getKey(Key)]);
Expand Down
4 changes: 2 additions & 2 deletions llvm/unittests/ADT/SmallPtrSetTest.cpp
Expand Up @@ -28,7 +28,7 @@ TEST(SmallPtrSetTest, Assignment) {
(s2 = s1).insert(&buf[2]);

// Self assign as well.
(s2 = s2).insert(&buf[3]);
(s2 = static_cast<SmallPtrSet<int *, 4> &>(s2)).insert(&buf[3]);

s1 = s2;
EXPECT_EQ(4U, s1.size());
Expand Down Expand Up @@ -56,7 +56,7 @@ TEST(SmallPtrSetTest, GrowthTest) {

SmallPtrSet<int *, 4> s;
typedef SmallPtrSet<int *, 4>::iterator iter;

s.insert(&buf[0]);
s.insert(&buf[1]);
s.insert(&buf[2]);
Expand Down
2 changes: 1 addition & 1 deletion llvm/unittests/ADT/SparseBitVectorTest.cpp
Expand Up @@ -68,7 +68,7 @@ TEST(SparseBitVectorTest, SelfAssignment) {

Vec.set(23);
Vec.set(234);
Vec = Vec;
Vec = static_cast<SparseBitVector<> &>(Vec);
EXPECT_TRUE(Vec.test(23));
EXPECT_TRUE(Vec.test(234));

Expand Down

0 comments on commit 429b003

Please sign in to comment.