re PR libstdc++/54388 (std::array.at() const results in undefined behaviour)
PR libstdc++/54388 * include/std/array (array::at() const): Ensure lvalue result. * testsuite/23_containers/array/element_access/54388.cc: New. * testsuite/23_containers/array/tuple_interface/get_neg.cc: Adjust dg-error line numbers. * testsuite/23_containers/array/tuple_interface/tuple_element_neg.cc: Likewise. From-SVN: r191114
This commit is contained in:
parent
b4661bfe21
commit
885e812159
|
@ -1,3 +1,13 @@
|
||||||
|
2012-09-08 Jonathan Wakely <jwakely.gcc@gmail.com>
|
||||||
|
|
||||||
|
PR libstdc++/54388
|
||||||
|
* include/std/array (array::at() const): Ensure lvalue result.
|
||||||
|
* testsuite/23_containers/array/element_access/54388.cc: New.
|
||||||
|
* testsuite/23_containers/array/tuple_interface/get_neg.cc: Adjust
|
||||||
|
dg-error line numbers.
|
||||||
|
* testsuite/23_containers/array/tuple_interface/tuple_element_neg.cc:
|
||||||
|
Likewise.
|
||||||
|
|
||||||
2012-09-09 Ulrich Drepper <drepper@gmail.com>
|
2012-09-09 Ulrich Drepper <drepper@gmail.com>
|
||||||
Dominique d'Humieres <dominiq@lps.ens.fr>
|
Dominique d'Humieres <dominiq@lps.ens.fr>
|
||||||
Jack Howarth <howarth@bromo.med.uc.edu>
|
Jack Howarth <howarth@bromo.med.uc.edu>
|
||||||
|
|
|
@ -164,22 +164,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
||||||
return _M_instance[__n];
|
return _M_instance[__n];
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef __EXCEPTIONS
|
|
||||||
constexpr const_reference
|
constexpr const_reference
|
||||||
at(size_type __n) const
|
at(size_type __n) const
|
||||||
{
|
{
|
||||||
return __n < _Nm ?
|
// Result of conditional expression must be an lvalue so use
|
||||||
_M_instance[__n] : throw out_of_range(__N("array::at"));
|
// boolean ? lvalue : (throw-expr, lvalue)
|
||||||
|
return __n < _Nm ? _M_instance[__n]
|
||||||
|
: (std::__throw_out_of_range(__N("array::at")), _M_instance[0]);
|
||||||
}
|
}
|
||||||
#else
|
|
||||||
const_reference
|
|
||||||
at(size_type __n) const
|
|
||||||
{
|
|
||||||
if (__n >= _Nm)
|
|
||||||
std::__throw_out_of_range(__N("array::at"));
|
|
||||||
return _M_instance[__n];
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
reference
|
reference
|
||||||
front()
|
front()
|
||||||
|
|
|
@ -0,0 +1,42 @@
|
||||||
|
// { dg-options "-std=gnu++0x" }
|
||||||
|
//
|
||||||
|
// Copyright (C) 2012 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
|
||||||
|
// <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
#include <array>
|
||||||
|
#include <testsuite_hooks.h>
|
||||||
|
|
||||||
|
struct A
|
||||||
|
{
|
||||||
|
bool valid = true;
|
||||||
|
~A() { valid = false; }
|
||||||
|
};
|
||||||
|
|
||||||
|
void
|
||||||
|
test01()
|
||||||
|
{
|
||||||
|
bool test __attribute__((unused)) = true;
|
||||||
|
|
||||||
|
const std::array<A, 1> a;
|
||||||
|
const A& aa = a.at(0);
|
||||||
|
VERIFY(aa.valid);
|
||||||
|
}
|
||||||
|
|
||||||
|
int main()
|
||||||
|
{
|
||||||
|
test01();
|
||||||
|
}
|
|
@ -29,4 +29,4 @@ int n3 = std::get<1>(ca);
|
||||||
|
|
||||||
// { dg-error "static assertion failed" "" { target *-*-* } 275 }
|
// { dg-error "static assertion failed" "" { target *-*-* } 275 }
|
||||||
// { dg-error "static assertion failed" "" { target *-*-* } 283 }
|
// { dg-error "static assertion failed" "" { target *-*-* } 283 }
|
||||||
// { dg-error "static assertion failed" "" { target *-*-* } 291 }
|
// { dg-error "static assertion failed" "" { target *-*-* } 267 }
|
||||||
|
|
|
@ -22,4 +22,4 @@
|
||||||
|
|
||||||
typedef std::tuple_element<1, std::array<int, 1>>::type type;
|
typedef std::tuple_element<1, std::array<int, 1>>::type type;
|
||||||
|
|
||||||
// { dg-error "static assertion failed" "" { target *-*-* } 267 }
|
// { dg-error "static assertion failed" "" { target *-*-* } 259 }
|
||||||
|
|
Loading…
Reference in New Issue