From 648c989484e4d1dc0c88bbe88886e8b59d1720ba Mon Sep 17 00:00:00 2001 From: Ville Voutilainen Date: Mon, 13 Mar 2017 21:41:50 +0200 Subject: [PATCH] re PR libstdc++/80034 (unqualified calls to std::distance in std::list::sort) PR libstdc++/80034 * include/bits/list.tcc (merge(list&&)): Use const for the size_t in the catch-block. (merge(list&&, _StrictWeakOrdering)): Likewise. * testsuite/23_containers/list/operations/80034.cc: New. From-SVN: r246107 --- libstdc++-v3/ChangeLog | 8 ++++++ libstdc++-v3/include/bits/list.tcc | 4 +-- .../23_containers/list/operations/80034.cc | 32 ++++++++++++++++++++++ 3 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 libstdc++-v3/testsuite/23_containers/list/operations/80034.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index c85d6a7..544d155 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,13 @@ 2017-03-13 Ville Voutilainen + PR libstdc++/80034 + * include/bits/list.tcc (merge(list&&)): Use const for the size_t + in the catch-block. + (merge(list&&, _StrictWeakOrdering)): Likewise. + * testsuite/23_containers/list/operations/80034.cc: New. + +2017-03-13 Ville Voutilainen + Implement LWG 2806, Base class of bad_optional_access. * include/std/optional (bad_optional_access): Derive from std::exception. diff --git a/libstdc++-v3/include/bits/list.tcc b/libstdc++-v3/include/bits/list.tcc index 9623a13..fcb8353 100644 --- a/libstdc++-v3/include/bits/list.tcc +++ b/libstdc++-v3/include/bits/list.tcc @@ -405,7 +405,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER } __catch(...) { - size_t __dist = std::distance(__first2, __last2); + const size_t __dist = std::distance(__first2, __last2); this->_M_inc_size(__orig_size - __dist); __x._M_set_size(__dist); __throw_exception_again; @@ -453,7 +453,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER } __catch(...) { - size_t __dist = std::distance(__first2, __last2); + const size_t __dist = std::distance(__first2, __last2); this->_M_inc_size(__orig_size - __dist); __x._M_set_size(__dist); __throw_exception_again; diff --git a/libstdc++-v3/testsuite/23_containers/list/operations/80034.cc b/libstdc++-v3/testsuite/23_containers/list/operations/80034.cc new file mode 100644 index 0000000..5c3decd --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/list/operations/80034.cc @@ -0,0 +1,32 @@ +// { dg-do compile } +// Copyright (C) 2017 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 +// . + +#include + +namespace X { + struct Y { }; + bool operator<(Y, Y) { return false; } + template + void distance(T, T) { } +} + +int main() +{ + std::list l; + l.sort(); +} -- 2.7.4