[v3] libstdc++/57666
Paolo Carlini
paolo.carlini@oracle.com
Fri Jun 21 11:08:00 GMT 2013
... grrr, I attached the wrong testcase, isn't testing anything.
Corrected below.
Paolo.
///////////////////
-------------- next part --------------
Index: include/std/valarray
===================================================================
--- include/std/valarray (revision 200268)
+++ include/std/valarray (working copy)
@@ -819,8 +819,21 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
inline valarray<_Tp>&
valarray<_Tp>::operator=(const _Expr<_Dom, _Tp>& __e)
{
- _GLIBCXX_DEBUG_ASSERT(_M_size == __e.size());
- std::__valarray_copy(__e, _M_size, _Array<_Tp>(_M_data));
+ // _GLIBCXX_RESOLVE_LIB_DEFECTS
+ // 630. arrays of valarray.
+ if (_M_size == __e.size())
+ std::__valarray_copy(__e, _M_size, _Array<_Tp>(_M_data));
+ else
+ {
+ if (_M_data)
+ {
+ std::__valarray_destroy_elements(_M_data, _M_data + _M_size);
+ std::__valarray_release_memory(_M_data);
+ }
+ _M_size = __e.size();
+ _M_data = __valarray_get_storage<_Tp>(_M_size);
+ std::__valarray_copy_construct(__e, _M_size, _Array<_Tp>(_M_data));
+ }
return *this;
}
Index: testsuite/26_numerics/valarray/dr630-3.C
===================================================================
--- testsuite/26_numerics/valarray/dr630-3.C (revision 0)
+++ testsuite/26_numerics/valarray/dr630-3.C (working copy)
@@ -0,0 +1,37 @@
+// Copyright (C) 2013 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 <valarray>
+#include <testsuite_hooks.h>
+
+// libstdc++/57666
+void test01()
+{
+ bool test __attribute__((unused)) = true;
+
+ std::valarray<int> a(3), b(3), d1, d2;
+ d1 = a;
+ VERIFY( d1.size() == 3 );
+ d2 = a + b;
+ VERIFY( d2.size() == 3 );
+}
+
+int main()
+{
+ test01();
+ return 0;
+}
More information about the Gcc-patches
mailing list