On 20 March 2018 at 21:06, Jonathan Wakely wrote:
> On 20 March 2018 at 21:02, François Dumont wrote:
>> On 20/03/2018 19:20, Jonathan Wakely wrote:
>>>
>>> On 17 March 2018 at 09:01, Jonathan Wakely wrote:
>>>>
>>>> Native configuration is x86_64-pc-linux-gnu
>>>>
>>>> === libstdc++ tests ===
>>>>
>>>>
>>>> Running target unix/-std=gnu++11/-D_GLIBCXX_ASSERTIONS
>>>>
>>>> === libstdc++ Summary for
>>>> unix/-std=gnu++11/-D_GLIBCXX_ASSERTIONS ===
>>>>
>>>> # of expected passes 12330
>>>> # of expected failures 71
>>>> # of unsupported tests 579
>>>>
>>>> Running target unix/-std=gnu++11/-D_GLIBCXX_DEBUG
>>>> XPASS: 21_strings/basic_string_view/element_access/char/2.cc execution
>>>> test
>>>> XPASS: 21_strings/basic_string_view/element_access/wchar_t/2.cc execution
>>>> test
>>>> FAIL: 23_containers/bitset/hash/1.cc (test for excess errors)
>>>> UNRESOLVED: 23_containers/bitset/hash/1.cc compilation failed to produce
>>>> executable
>>>
>>> These debug mode failures are regressions, reported as
>>> https://gcc.gnu.org/PR84998
>>>
>>> I think they all have the same root cause (Nathan fixed a bug in G++).
>>>
>> I had already prepared this patch. Thanks for explaining why we have this
>> problem now.
>
> Ah I was just about to commit my own fix.
>
>> Note that I chose to use full specialization with std::hash<> for
>> std::bitset and std::vector<bool>.
>
> Great, that's an improvement over my patch.
>
>> It also fix a versioned namespace issue when partially specializing
>> std::hash for debug vector<bool>.
>
> Even better.
>
>> Tested under Linux x86_64 normal, debug and versioned namespace modes.
>>
>> Ok to commit ?
>
> Yes please!
>
> Please be sure to add "PR libstdc++/84998" to the changelog entry so
> it updates bugzilla.
>
> Thanks very much.
This adds a test for the hash specializations in debug mode, and fixes
another failure caused by different line numbers in debug mode.
Committed to trunk.
commit 347afbec5010ed9edeff70ce18d5e2511a7c27f4
Author: Jonathan Wakely <jwak...@redhat.com>
Date: Sun Mar 18 00:01:07 2018 +0000
Fix some libstdc++ testsuite failures
* testsuite/20_util/function_objects/comparisons_pointer.cc: Use
VERIFY instead of assert.
* testsuite/20_util/hash/84998.cc: New test.
* testsuite/23_containers/vector/cons/destructible_debug_neg.cc: New
copy of test adjusted for Debug Mode.
* testsuite/23_containers/vector/cons/destructible_neg.cc: Do not
run
test in Debug Mode.
diff --git
a/libstdc++-v3/testsuite/20_util/function_objects/comparisons_pointer.cc
b/libstdc++-v3/testsuite/20_util/function_objects/comparisons_pointer.cc
index aad0bc3dd2e..474190cdf81 100644
--- a/libstdc++-v3/testsuite/20_util/function_objects/comparisons_pointer.cc
+++ b/libstdc++-v3/testsuite/20_util/function_objects/comparisons_pointer.cc
@@ -174,7 +174,7 @@ test05()
int n = 0;
while (ss >> n)
sum += n;
- assert( sum == 1 );
+ VERIFY( sum == 1 );
#if __cplusplus >= 201402L
static_assert( lt(y, y+1), "constexpr less<const X*>" );
diff --git a/libstdc++-v3/testsuite/20_util/hash/84998.cc
b/libstdc++-v3/testsuite/20_util/hash/84998.cc
new file mode 100644
index 00000000000..72bd203cb04
--- /dev/null
+++ b/libstdc++-v3/testsuite/20_util/hash/84998.cc
@@ -0,0 +1,40 @@
+// Copyright (C) 2018 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/>.
+
+// { dg-options "-D_GLIBCXX_DEBUG" }
+// { dg-do compile { target c++11 } }
+
+// PR libstdc++/84998
+
+#include <bitset>
+#include <vector>
+
+std::size_t
+test01()
+{
+ std::bitset<1> b;
+ std::hash<std::bitset<1>> h;
+ return h(b);
+}
+
+std::size_t
+test02()
+{
+ std::vector<bool> b;
+ std::hash<std::vector<bool>> h;
+ return h(b);
+}
diff --git
a/libstdc++-v3/testsuite/23_containers/vector/cons/destructible_debug_neg.cc
b/libstdc++-v3/testsuite/23_containers/vector/cons/destructible_debug_neg.cc
new file mode 100644
index 00000000000..5127f5105f4
--- /dev/null
+++ b/libstdc++-v3/testsuite/23_containers/vector/cons/destructible_debug_neg.cc
@@ -0,0 +1,48 @@
+// Copyright (C) 2017-2018 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/>.
+
+// { dg-options "-D_GLIBCXX_DEBUG" }
+// { dg-do compile { target c++11 } }
+
+#include <vector>
+
+// PR libstdc++/80553
+
+struct DeletedDtor {
+ ~DeletedDtor() = delete;
+};
+
+class PrivateDtor {
+ ~PrivateDtor() { }
+};
+
+void
+test01()
+{
+ std::vector<DeletedDtor> v;
+}
+
+void
+test02()
+{
+ std::vector<PrivateDtor> v;
+}
+
+// { dg-error "value type is destructible" "" { target *-*-* } 0 }
+
+// In Debug Mode the "required from here" errors come from <debug/vector>
+// { dg-error "required from here" "" { target *-*-* } 155 }
diff --git
a/libstdc++-v3/testsuite/23_containers/vector/cons/destructible_neg.cc
b/libstdc++-v3/testsuite/23_containers/vector/cons/destructible_neg.cc
index fc5e3192c87..06fd0730106 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/cons/destructible_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/cons/destructible_neg.cc
@@ -16,6 +16,7 @@
// <http://www.gnu.org/licenses/>.
// { dg-do compile { target c++11 } }
+// { dg-require-normal-mode "" }
#include <vector>
