From 2e3f48dc43aae10019e0e56ac0e7323d1e14531a Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 30 Jul 2015 11:00:39 +0100 Subject: [PATCH] any (any::operator=(const any&)): Check for self-assignment. * include/experimental/any (any::operator=(const any&)): Check for self-assignment. * testsuite/experimental/any/assign/self.cc: New. * testsuite/experimental/any/misc/any_cast_neg.cc: Adjust dg-error. From-SVN: r226393 --- libstdc++-v3/ChangeLog | 7 ++++ libstdc++-v3/include/experimental/any | 3 ++ .../testsuite/experimental/any/assign/self.cc | 41 +++++++++++++++++++ .../experimental/any/misc/any_cast_neg.cc | 2 +- 4 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 libstdc++-v3/testsuite/experimental/any/assign/self.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 98758f41862..fc4eca92bdf 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2015-07-30 Jonathan Wakely + + * include/experimental/any (any::operator=(const any&)): Check for + self-assignment. + * testsuite/experimental/any/assign/self.cc: New. + * testsuite/experimental/any/misc/any_cast_neg.cc: Adjust dg-error. + 2015-07-29 Jonathan Wakely PR libstdc++/66829 diff --git a/libstdc++-v3/include/experimental/any b/libstdc++-v3/include/experimental/any index 7b5e5ecbcba..fbb70a7ae55 100644 --- a/libstdc++-v3/include/experimental/any +++ b/libstdc++-v3/include/experimental/any @@ -175,6 +175,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /// Copy the state of another object. any& operator=(const any& __rhs) { + if (this == &__rhs) + return *this; + if (__rhs.empty()) clear(); else diff --git a/libstdc++-v3/testsuite/experimental/any/assign/self.cc b/libstdc++-v3/testsuite/experimental/any/assign/self.cc new file mode 100644 index 00000000000..0fb9566bde0 --- /dev/null +++ b/libstdc++-v3/testsuite/experimental/any/assign/self.cc @@ -0,0 +1,41 @@ +// Copyright (C) 2015 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-options "-std=gnu++14" } + +#include +#include + +void +test01() +{ + using std::experimental::any; + + any a; + a = a; + VERIFY( a.empty() ); + + a = 1; + a = a; + VERIFY( !a.empty() ); +} + +int +main() +{ + test01(); +} diff --git a/libstdc++-v3/testsuite/experimental/any/misc/any_cast_neg.cc b/libstdc++-v3/testsuite/experimental/any/misc/any_cast_neg.cc index 39e322642aa..b88592a108d 100644 --- a/libstdc++-v3/testsuite/experimental/any/misc/any_cast_neg.cc +++ b/libstdc++-v3/testsuite/experimental/any/misc/any_cast_neg.cc @@ -26,5 +26,5 @@ void test01() using std::experimental::any_cast; const any y(1); - any_cast(y); // { dg-error "qualifiers" "" { target { *-*-* } } 356 } + any_cast(y); // { dg-error "qualifiers" "" { target { *-*-* } } 359 } } -- 2.30.2