|
|
|
|
@ -1,458 +0,0 @@
|
|
|
|
|
.../testsuite/libstdc++-prettyprinters/compat.cc | 11 +-
|
|
|
|
|
.../testsuite/libstdc++-prettyprinters/cxx11.cc | 129 +++++++++++++++------
|
|
|
|
|
.../testsuite/libstdc++-prettyprinters/cxx17.cc | 50 +++++---
|
|
|
|
|
.../libstdc++-prettyprinters/filesystem-ts.cc | 8 +-
|
|
|
|
|
.../libstdc++-prettyprinters/libfundts.cc | 26 +++--
|
|
|
|
|
5 files changed, 146 insertions(+), 78 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/libstdc++-v3/testsuite/libstdc++-prettyprinters/compat.cc b/libstdc++-v3/testsuite/libstdc++-prettyprinters/compat.cc
|
|
|
|
|
index 81e0ce7213f..604a6f6415b 100644
|
|
|
|
|
--- a/libstdc++-v3/testsuite/libstdc++-prettyprinters/compat.cc
|
|
|
|
|
+++ b/libstdc++-v3/testsuite/libstdc++-prettyprinters/compat.cc
|
|
|
|
|
@@ -1,8 +1,7 @@
|
|
|
|
|
// { dg-options "-g -O0" }
|
|
|
|
|
// { dg-do run { target c++11 } }
|
|
|
|
|
-// { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PROFILE" } }
|
|
|
|
|
|
|
|
|
|
-// Copyright (C) 2014-2019 Free Software Foundation, Inc.
|
|
|
|
|
+// Copyright (C) 2014-2024 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
|
|
|
|
|
@@ -103,13 +102,13 @@ main()
|
|
|
|
|
using std::optional;
|
|
|
|
|
|
|
|
|
|
optional<int> o;
|
|
|
|
|
-// { dg-final { note-test o {std::optional<int> [no contained value]} } }
|
|
|
|
|
+// { dg-final { note-test o {std::optional [no contained value]} } }
|
|
|
|
|
optional<bool> ob{false};
|
|
|
|
|
-// { dg-final { note-test ob {std::optional<bool> = {[contained value] = false}} } }
|
|
|
|
|
+// { dg-final { note-test ob {std::optional = {[contained value] = false}} } }
|
|
|
|
|
optional<int> oi{5};
|
|
|
|
|
-// { dg-final { note-test oi {std::optional<int> = {[contained value] = 5}} } }
|
|
|
|
|
+// { dg-final { note-test oi {std::optional = {[contained value] = 5}} } }
|
|
|
|
|
optional<void*> op{nullptr};
|
|
|
|
|
-// { dg-final { note-test op {std::optional<void *> = {[contained value] = 0x0}} } }
|
|
|
|
|
+// { dg-final { note-test op {std::optional = {[contained value] = 0x0}} } }
|
|
|
|
|
|
|
|
|
|
__builtin_puts("");
|
|
|
|
|
return 0; // Mark SPOT
|
|
|
|
|
diff --git a/libstdc++-v3/testsuite/libstdc++-prettyprinters/cxx11.cc b/libstdc++-v3/testsuite/libstdc++-prettyprinters/cxx11.cc
|
|
|
|
|
index 9a90d8d91db..2f75d12703c 100644
|
|
|
|
|
--- a/libstdc++-v3/testsuite/libstdc++-prettyprinters/cxx11.cc
|
|
|
|
|
+++ b/libstdc++-v3/testsuite/libstdc++-prettyprinters/cxx11.cc
|
|
|
|
|
@@ -1,8 +1,7 @@
|
|
|
|
|
// { dg-do run { target c++11 } }
|
|
|
|
|
// { dg-options "-g -O0" }
|
|
|
|
|
-// { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PROFILE" } }
|
|
|
|
|
|
|
|
|
|
-// Copyright (C) 2011-2018 Free Software Foundation, Inc.
|
|
|
|
|
+// Copyright (C) 2011-2024 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
|
|
|
|
|
@@ -25,6 +24,10 @@
|
|
|
|
|
#include <string>
|
|
|
|
|
#include <memory>
|
|
|
|
|
#include <iostream>
|
|
|
|
|
+#include <future>
|
|
|
|
|
+#include <initializer_list>
|
|
|
|
|
+#include <atomic>
|
|
|
|
|
+#include "../util/testsuite_allocator.h" // NullablePointer
|
|
|
|
|
|
|
|
|
|
typedef std::tuple<int, int> ExTuple;
|
|
|
|
|
|
|
|
|
|
@@ -60,84 +63,74 @@ struct datum
|
|
|
|
|
|
|
|
|
|
std::unique_ptr<datum> global;
|
|
|
|
|
|
|
|
|
|
-struct Deleter
|
|
|
|
|
-{
|
|
|
|
|
- // Deleter is not an empty class:
|
|
|
|
|
- int deleter_member = -1;
|
|
|
|
|
- // But pointer is an empty class:
|
|
|
|
|
- struct pointer
|
|
|
|
|
- {
|
|
|
|
|
- pointer(const void* = nullptr) { }
|
|
|
|
|
- explicit operator bool() const noexcept { return false; }
|
|
|
|
|
- friend bool operator==(pointer, pointer) noexcept { return true; }
|
|
|
|
|
- friend bool operator!=(pointer, pointer) noexcept { return false; }
|
|
|
|
|
- };
|
|
|
|
|
- void operator()(pointer) const noexcept { }
|
|
|
|
|
+struct custom_cat : std::error_category {
|
|
|
|
|
+ const char* name() const noexcept { return "miaow"; }
|
|
|
|
|
+ std::string message(int) const { return ""; }
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
main()
|
|
|
|
|
{
|
|
|
|
|
std::forward_list<int> efl;
|
|
|
|
|
-// { dg-final { note-test efl "empty std::forward_list" } }
|
|
|
|
|
+// { dg-final { regexp-test efl "empty std::(__debug::)?forward_list" } }
|
|
|
|
|
|
|
|
|
|
std::forward_list<int> &refl = efl;
|
|
|
|
|
-// { dg-final { note-test refl "empty std::forward_list" } }
|
|
|
|
|
+// { dg-final { regexp-test refl "empty std::(__debug::)?forward_list" } }
|
|
|
|
|
|
|
|
|
|
std::forward_list<int> fl;
|
|
|
|
|
fl.push_front(2);
|
|
|
|
|
fl.push_front(1);
|
|
|
|
|
-// { dg-final { note-test fl {std::forward_list = {[0] = 1, [1] = 2}} } }
|
|
|
|
|
+// { dg-final { regexp-test fl {std::(__debug::)?forward_list = {\[0\] = 1, \[1\] = 2}} } }
|
|
|
|
|
|
|
|
|
|
std::forward_list<int> &rfl = fl;
|
|
|
|
|
-// { dg-final { note-test rfl {std::forward_list = {[0] = 1, [1] = 2}} } }
|
|
|
|
|
+// { dg-final { regexp-test rfl {std::(__debug::)?forward_list = {\[0\] = 1, \[1\] = 2}} } }
|
|
|
|
|
|
|
|
|
|
std::unordered_map<int, std::string> eum;
|
|
|
|
|
-// { dg-final { note-test eum "std::unordered_map with 0 elements" } }
|
|
|
|
|
+// { dg-final { regexp-test eum "std::(__debug::)?unordered_map with 0 elements" } }
|
|
|
|
|
std::unordered_map<int, std::string> &reum = eum;
|
|
|
|
|
-// { dg-final { note-test reum "std::unordered_map with 0 elements" } }
|
|
|
|
|
+// { dg-final { regexp-test reum "std::(__debug::)?unordered_map with 0 elements" } }
|
|
|
|
|
|
|
|
|
|
std::unordered_multimap<int, std::string> eumm;
|
|
|
|
|
-// { dg-final { note-test eumm "std::unordered_multimap with 0 elements" } }
|
|
|
|
|
+// { dg-final { regexp-test eumm "std::(__debug::)?unordered_multimap with 0 elements" } }
|
|
|
|
|
std::unordered_multimap<int, std::string> &reumm = eumm;
|
|
|
|
|
-// { dg-final { note-test reumm "std::unordered_multimap with 0 elements" } }
|
|
|
|
|
+// { dg-final { regexp-test reumm "std::(__debug::)?unordered_multimap with 0 elements" } }
|
|
|
|
|
|
|
|
|
|
std::unordered_set<int> eus;
|
|
|
|
|
-// { dg-final { note-test eus "std::unordered_set with 0 elements" } }
|
|
|
|
|
+// { dg-final { regexp-test eus "std::(__debug::)?unordered_set with 0 elements" } }
|
|
|
|
|
std::unordered_set<int> &reus = eus;
|
|
|
|
|
-// { dg-final { note-test reus "std::unordered_set with 0 elements" } }
|
|
|
|
|
+// { dg-final { regexp-test reus "std::(__debug::)?unordered_set with 0 elements" } }
|
|
|
|
|
|
|
|
|
|
std::unordered_multiset<int> eums;
|
|
|
|
|
-// { dg-final { note-test eums "std::unordered_multiset with 0 elements" } }
|
|
|
|
|
+// { dg-final { regexp-test eums "std::(__debug::)?unordered_multiset with 0 elements" } }
|
|
|
|
|
std::unordered_multiset<int> &reums = eums;
|
|
|
|
|
-// { dg-final { note-test reums "std::unordered_multiset with 0 elements" } }
|
|
|
|
|
+// { dg-final { regexp-test reums "std::(__debug::)?unordered_multiset with 0 elements" } }
|
|
|
|
|
|
|
|
|
|
std::unordered_map<int, std::string> uom;
|
|
|
|
|
uom[5] = "three";
|
|
|
|
|
uom[3] = "seven";
|
|
|
|
|
-// { dg-final { note-test uom {std::unordered_map with 2 elements = {[3] = "seven", [5] = "three"}} } }
|
|
|
|
|
+// { dg-final { regexp-test uom {std::(__debug::)?unordered_map with 2 elements = {\[3\] = "seven", \[5\] = "three"}} } }
|
|
|
|
|
|
|
|
|
|
std::unordered_map<int, std::string> &ruom = uom;
|
|
|
|
|
-// { dg-final { note-test ruom {std::unordered_map with 2 elements = {[3] = "seven", [5] = "three"}} } }
|
|
|
|
|
+// { dg-final { regexp-test ruom {std::(__debug::)?unordered_map with 2 elements = {\[3\] = "seven", \[5\] = "three"}} } }
|
|
|
|
|
|
|
|
|
|
std::unordered_multimap<int, std::string> uomm;
|
|
|
|
|
uomm.insert(std::pair<int, std::string> (5, "three"));
|
|
|
|
|
uomm.insert(std::pair<int, std::string> (5, "seven"));
|
|
|
|
|
-// { dg-final { note-test uomm {std::unordered_multimap with 2 elements = {[5] = "seven", [5] = "three"}} } }
|
|
|
|
|
+// { dg-final { regexp-test uomm {std::(__debug::)?unordered_multimap with 2 elements = {\[5\] = "seven", \[5\] = "three"}} } }
|
|
|
|
|
std::unordered_multimap<int, std::string> &ruomm = uomm;
|
|
|
|
|
-// { dg-final { note-test ruomm {std::unordered_multimap with 2 elements = {[5] = "seven", [5] = "three"}} } }
|
|
|
|
|
+// { dg-final { regexp-test ruomm {std::(__debug::)?unordered_multimap with 2 elements = {\[5\] = "seven", \[5\] = "three"}} } }
|
|
|
|
|
|
|
|
|
|
std::unordered_set<int> uos;
|
|
|
|
|
uos.insert(5);
|
|
|
|
|
-// { dg-final { note-test uos {std::unordered_set with 1 element = {[0] = 5}} } }
|
|
|
|
|
+// { dg-final { regexp-test uos {std::(__debug::)?unordered_set with 1 element = {\[0\] = 5}} } }
|
|
|
|
|
std::unordered_set<int> &ruos = uos;
|
|
|
|
|
-// { dg-final { note-test ruos {std::unordered_set with 1 element = {[0] = 5}} } }
|
|
|
|
|
+// { dg-final { regexp-test ruos {std::(__debug::)?unordered_set with 1 element = {\[0\] = 5}} } }
|
|
|
|
|
|
|
|
|
|
std::unordered_multiset<int> uoms;
|
|
|
|
|
uoms.insert(5);
|
|
|
|
|
-// { dg-final { note-test uoms {std::unordered_multiset with 1 element = {[0] = 5}} } }
|
|
|
|
|
+// { dg-final { regexp-test uoms {std::(__debug::)?unordered_multiset with 1 element = {\[0\] = 5}} } }
|
|
|
|
|
std::unordered_multiset<int> &ruoms = uoms;
|
|
|
|
|
-// { dg-final { note-test ruoms {std::unordered_multiset with 1 element = {[0] = 5}} } }
|
|
|
|
|
+// { dg-final { regexp-test ruoms {std::(__debug::)?unordered_multiset with 1 element = {\[0\] = 5}} } }
|
|
|
|
|
|
|
|
|
|
std::unique_ptr<datum> uptr (new datum);
|
|
|
|
|
uptr->s = "hi bob";
|
|
|
|
|
@@ -152,15 +145,77 @@ main()
|
|
|
|
|
std::unique_ptr<data>& rarrptr = arrptr;
|
|
|
|
|
// { dg-final { regexp-test rarrptr {std::unique_ptr.datum \[\]. = {get\(\) = 0x.*}} } }
|
|
|
|
|
|
|
|
|
|
+ struct Deleter
|
|
|
|
|
+ {
|
|
|
|
|
+ int deleter_member = -1;
|
|
|
|
|
+ using pointer = __gnu_test::NullablePointer<void>;
|
|
|
|
|
+ void operator()(pointer) const noexcept { }
|
|
|
|
|
+ };
|
|
|
|
|
+ static_assert( !std::is_empty<Deleter>(), "Deleter is not empty" );
|
|
|
|
|
+ static_assert( std::is_empty<Deleter::pointer>(), "but pointer is empty" );
|
|
|
|
|
+
|
|
|
|
|
std::unique_ptr<int, Deleter> empty_ptr;
|
|
|
|
|
// { dg-final { note-test empty_ptr {std::unique_ptr<int> = {get() = {<No data fields>}}} } }
|
|
|
|
|
std::unique_ptr<int, Deleter>& rempty_ptr = empty_ptr;
|
|
|
|
|
// { dg-final { note-test rempty_ptr {std::unique_ptr<int> = {get() = {<No data fields>}}} } }
|
|
|
|
|
|
|
|
|
|
+ struct Deleter_pr103086
|
|
|
|
|
+ {
|
|
|
|
|
+ int deleter_member = -1;
|
|
|
|
|
+ void operator()(int*) const noexcept { }
|
|
|
|
|
+ };
|
|
|
|
|
+
|
|
|
|
|
+ std::unique_ptr<int, Deleter_pr103086> uniq_ptr;
|
|
|
|
|
+// { dg-final { note-test uniq_ptr {std::unique_ptr<int> = {get() = 0x0}} } }
|
|
|
|
|
+ std::unique_ptr<int, Deleter_pr103086>& runiq_ptr = uniq_ptr;
|
|
|
|
|
+// { dg-final { note-test runiq_ptr {std::unique_ptr<int> = {get() = 0x0}} } }
|
|
|
|
|
+
|
|
|
|
|
ExTuple tpl(6,7);
|
|
|
|
|
-// { dg-final { note-test tpl {std::tuple containing = {[1] = 6, [2] = 7}} } }
|
|
|
|
|
+// { dg-final { note-test tpl {std::tuple containing = {[0] = 6, [1] = 7}} } }
|
|
|
|
|
ExTuple &rtpl = tpl;
|
|
|
|
|
-// { dg-final { note-test rtpl {std::tuple containing = {[1] = 6, [2] = 7}} } }
|
|
|
|
|
+// { dg-final { note-test rtpl {std::tuple containing = {[0] = 6, [1] = 7}} } }
|
|
|
|
|
+
|
|
|
|
|
+ std::error_code e0;
|
|
|
|
|
+ // { dg-final { note-test e0 {std::error_code = { }} } }
|
|
|
|
|
+ std::error_condition ec0;
|
|
|
|
|
+ // { dg-final { note-test ec0 {std::error_condition = { }} } }
|
|
|
|
|
+ std::error_code einval = std::make_error_code(std::errc::invalid_argument);
|
|
|
|
|
+ // { dg-final { note-test einval {std::error_code = {"generic": EINVAL}} } }
|
|
|
|
|
+ std::error_condition ecinval = std::make_error_condition(std::errc::invalid_argument);
|
|
|
|
|
+ // { dg-final { note-test ecinval {std::error_condition = {"generic": EINVAL}} } }
|
|
|
|
|
+
|
|
|
|
|
+ custom_cat cat;
|
|
|
|
|
+ std::error_code emiaow(42, cat);
|
|
|
|
|
+ // { dg-final { note-test emiaow {std::error_code = {custom_cat: 42}} } }
|
|
|
|
|
+ std::error_condition ecmiaow(42, cat);
|
|
|
|
|
+ // { dg-final { note-test ecmiaow {std::error_condition = {custom_cat: 42}} } }
|
|
|
|
|
+
|
|
|
|
|
+ std::error_code ecio = std::make_error_code(std::io_errc::stream);
|
|
|
|
|
+ // { dg-final { note-test ecio {std::error_code = {"io": stream}} } }
|
|
|
|
|
+ std::error_code ecfut0 = std::make_error_code(std::future_errc{});
|
|
|
|
|
+ // { dg-final { note-test ecfut0 {std::error_code = {"future": 0}} } }
|
|
|
|
|
+
|
|
|
|
|
+ std::initializer_list<int> emptyIl = {};
|
|
|
|
|
+ // { dg-final { note-test emptyIl {std::initializer_list of length 0} } }
|
|
|
|
|
+ std::initializer_list<int> il = {3, 4};
|
|
|
|
|
+ // { dg-final { note-test il {std::initializer_list of length 2 = {3, 4}} } }
|
|
|
|
|
+
|
|
|
|
|
+ std::atomic<int> ai{100};
|
|
|
|
|
+ // { dg-final { note-test ai {std::atomic<int> = { 100 }} } }
|
|
|
|
|
+ long l{};
|
|
|
|
|
+ std::atomic<long*> ap{&l};
|
|
|
|
|
+ // { dg-final { regexp-test ap {std::atomic.long \*. = { 0x.* }} } }
|
|
|
|
|
+ struct Value { int i, j; };
|
|
|
|
|
+ std::atomic<Value> av{{8, 9}};
|
|
|
|
|
+ // { dg-final { note-test av {std::atomic<Value> = { {i = 8, j = 9} }} } }
|
|
|
|
|
+
|
|
|
|
|
+ std::integral_constant<int, 1> one;
|
|
|
|
|
+ // { dg-final { note-test one {std::integral_constant<int, 1>} } }
|
|
|
|
|
+ std::integral_constant<bool, true> truth;
|
|
|
|
|
+ // { dg-final { note-test truth {std::true_type} } }
|
|
|
|
|
+ std::integral_constant<bool, 0> lies;
|
|
|
|
|
+ // { dg-final { note-test lies {std::false_type} } }
|
|
|
|
|
+
|
|
|
|
|
placeholder(""); // Mark SPOT
|
|
|
|
|
use(efl);
|
|
|
|
|
use(fl);
|
|
|
|
|
diff --git a/libstdc++-v3/testsuite/libstdc++-prettyprinters/cxx17.cc b/libstdc++-v3/testsuite/libstdc++-prettyprinters/cxx17.cc
|
|
|
|
|
index 0c7cb4c9bb6..c8b70622bef 100644
|
|
|
|
|
--- a/libstdc++-v3/testsuite/libstdc++-prettyprinters/cxx17.cc
|
|
|
|
|
+++ b/libstdc++-v3/testsuite/libstdc++-prettyprinters/cxx17.cc
|
|
|
|
|
@@ -1,8 +1,7 @@
|
|
|
|
|
-// { dg-options "-g -O0 -std=gnu++17" }
|
|
|
|
|
+// { dg-options "-g -O0" }
|
|
|
|
|
// { dg-do run { target c++17 } }
|
|
|
|
|
-// { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PROFILE" } }
|
|
|
|
|
|
|
|
|
|
-// Copyright (C) 2014-2018 Free Software Foundation, Inc.
|
|
|
|
|
+// Copyright (C) 2014-2024 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
|
|
|
|
|
@@ -19,9 +18,7 @@
|
|
|
|
|
// with this library; see the file COPYING3. If not see
|
|
|
|
|
// <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
|
|
-// Type printers only recognize the old std::string for now.
|
|
|
|
|
-#define _GLIBCXX_USE_CXX11_ABI 0
|
|
|
|
|
-
|
|
|
|
|
+#include <filesystem>
|
|
|
|
|
#include <any>
|
|
|
|
|
#include <optional>
|
|
|
|
|
#include <variant>
|
|
|
|
|
@@ -41,6 +38,11 @@ using std::unordered_set;
|
|
|
|
|
using std::shared_ptr;
|
|
|
|
|
using std::weak_ptr;
|
|
|
|
|
|
|
|
|
|
+struct X {
|
|
|
|
|
+ X(int) { }
|
|
|
|
|
+ X(const X&) { } // not trivially-copyable
|
|
|
|
|
+};
|
|
|
|
|
+
|
|
|
|
|
int
|
|
|
|
|
main()
|
|
|
|
|
{
|
|
|
|
|
@@ -48,18 +50,18 @@ main()
|
|
|
|
|
// { dg-final { note-test str "\"string\"" } }
|
|
|
|
|
|
|
|
|
|
optional<int> o;
|
|
|
|
|
-// { dg-final { note-test o {std::optional<int> [no contained value]} } }
|
|
|
|
|
+// { dg-final { note-test o {std::optional [no contained value]} } }
|
|
|
|
|
optional<bool> ob{false};
|
|
|
|
|
-// { dg-final { note-test ob {std::optional<bool> = {[contained value] = false}} } }
|
|
|
|
|
+// { dg-final { note-test ob {std::optional = {[contained value] = false}} } }
|
|
|
|
|
optional<int> oi{5};
|
|
|
|
|
-// { dg-final { note-test oi {std::optional<int> = {[contained value] = 5}} } }
|
|
|
|
|
+// { dg-final { note-test oi {std::optional = {[contained value] = 5}} } }
|
|
|
|
|
optional<void*> op{nullptr};
|
|
|
|
|
-// { dg-final { note-test op {std::optional<void *> = {[contained value] = 0x0}} } }
|
|
|
|
|
+// { dg-final { note-test op {std::optional = {[contained value] = 0x0}} } }
|
|
|
|
|
optional<std::map<int, double>> om;
|
|
|
|
|
om = std::map<int, double>{ {1, 2.}, {3, 4.}, {5, 6.} };
|
|
|
|
|
-// { dg-final { note-test om {std::optional<std::map<int, double>> containing std::map with 3 elements = {[1] = 2, [3] = 4, [5] = 6}} } }
|
|
|
|
|
+// { dg-final { regexp-test om {std::optional containing std::(__debug::)?map with 3 elements = {\[1\] = 2, \[3\] = 4, \[5\] = 6}} } }
|
|
|
|
|
optional<std::string> os{ "stringy" };
|
|
|
|
|
-// { dg-final { note-test os {std::optional<std::string> = {[contained value] = "stringy"}} } }
|
|
|
|
|
+// { dg-final { note-test os {std::optional = {[contained value] = "stringy"}} } }
|
|
|
|
|
|
|
|
|
|
any a;
|
|
|
|
|
// { dg-final { note-test a {std::any [no contained value]} } }
|
|
|
|
|
@@ -74,22 +76,25 @@ main()
|
|
|
|
|
any as2("stringiest");
|
|
|
|
|
// { dg-final { regexp-test as2 {std::any containing const char \* = {\[contained value\] = 0x[[:xdigit:]]+ "stringiest"}} } }
|
|
|
|
|
any am = *om;
|
|
|
|
|
-// { dg-final { note-test am {std::any containing std::map with 3 elements = {[1] = 2, [3] = 4, [5] = 6}} } }
|
|
|
|
|
+// { dg-final { regexp-test am {std::any containing std::(__debug::)?map with 3 elements = {\[1\] = 2, \[3\] = 4, \[5\] = 6}} } }
|
|
|
|
|
+ struct local_type { int i = 99; };
|
|
|
|
|
+ any al = local_type{};
|
|
|
|
|
+// { dg-final { note-test al {std::any containing local_type = {[contained value] = {i = 99}}} } }
|
|
|
|
|
|
|
|
|
|
struct S { operator int() { throw 42; }};
|
|
|
|
|
variant<float, int, string_view> v0;
|
|
|
|
|
-// { dg-final { note-test v0 {std::variant<float, int, std::string_view> [index 0] = {0}} } }
|
|
|
|
|
+// { dg-final { note-test v0 {std::variant [index 0] = {0}} } }
|
|
|
|
|
variant<float, int, string_view> v1{ 0.5f };
|
|
|
|
|
-// { dg-final { note-test v1 {std::variant<float, int, std::string_view> [index 0] = {0.5}} } }
|
|
|
|
|
- variant<float, int, string_view> v2;
|
|
|
|
|
+// { dg-final { note-test v1 {std::variant [index 0] = {0.5}} } }
|
|
|
|
|
+ variant<float, X, string_view> v2;
|
|
|
|
|
try {
|
|
|
|
|
v2.emplace<1>(S());
|
|
|
|
|
} catch (int) { }
|
|
|
|
|
-// { dg-final { note-test v2 {std::variant<float, int, std::string_view> [no contained value]} } }
|
|
|
|
|
+// { dg-final { note-test v2 {std::variant [no contained value]} } }
|
|
|
|
|
variant<float, int, string_view> v3{ 3 };
|
|
|
|
|
-// { dg-final { note-test v3 {std::variant<float, int, std::string_view> [index 1] = {3}} } }
|
|
|
|
|
+// { dg-final { note-test v3 {std::variant [index 1] = {3}} } }
|
|
|
|
|
variant<float, int, string_view> v4{ str };
|
|
|
|
|
-// { dg-final { note-test v4 {std::variant<float, int, std::string_view> [index 2] = {"string"}} } }
|
|
|
|
|
+// { dg-final { note-test v4 {std::variant [index 2] = {"string"}} } }
|
|
|
|
|
|
|
|
|
|
map<int, string_view> m{ {1, "one"} };
|
|
|
|
|
map<int, string_view>::node_type n0;
|
|
|
|
|
@@ -115,6 +120,13 @@ main()
|
|
|
|
|
// { dg-final { regexp-test q {std::shared_ptr.int \[2\]. \(use count 2, weak count 1\) = {get\(\) = 0x.*}} } }
|
|
|
|
|
// { dg-final { regexp-test wq {std::weak_ptr.int \[2\]. \(use count 2, weak count 1\) = {get\(\) = 0x.*}} } }
|
|
|
|
|
|
|
|
|
|
+ std::filesystem::path path0;
|
|
|
|
|
+// { dg-final { note-test path0 {filesystem::path ""} } }
|
|
|
|
|
+ std::filesystem::path path1("filename");
|
|
|
|
|
+// { dg-final { note-test path1 {filesystem::path "filename"} } }
|
|
|
|
|
+ std::filesystem::path path2("/dir/.");
|
|
|
|
|
+// { dg-final { note-test path2 {filesystem::path "/dir/." = {[root-directory] = "/", [1] = "dir", [2] = "."}} } }
|
|
|
|
|
+
|
|
|
|
|
std::cout << "\n";
|
|
|
|
|
return 0; // Mark SPOT
|
|
|
|
|
}
|
|
|
|
|
diff --git a/libstdc++-v3/testsuite/libstdc++-prettyprinters/filesystem-ts.cc b/libstdc++-v3/testsuite/libstdc++-prettyprinters/filesystem-ts.cc
|
|
|
|
|
index 8a1398f6c85..9faeed02852 100644
|
|
|
|
|
--- a/libstdc++-v3/testsuite/libstdc++-prettyprinters/filesystem-ts.cc
|
|
|
|
|
+++ b/libstdc++-v3/testsuite/libstdc++-prettyprinters/filesystem-ts.cc
|
|
|
|
|
@@ -2,7 +2,7 @@
|
|
|
|
|
// { dg-do run { target c++11 } }
|
|
|
|
|
// { dg-require-filesystem-ts "" }
|
|
|
|
|
|
|
|
|
|
-// Copyright (C) 2020 Free Software Foundation, Inc.
|
|
|
|
|
+// Copyright (C) 2020-2024 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
|
|
|
|
|
@@ -26,11 +26,11 @@ int
|
|
|
|
|
main()
|
|
|
|
|
{
|
|
|
|
|
std::experimental::filesystem::path path0;
|
|
|
|
|
-// { dg-final { note-test path0 {filesystem::path ""} } }
|
|
|
|
|
+// { dg-final { note-test path0 {experimental::filesystem::path ""} } }
|
|
|
|
|
std::experimental::filesystem::path path1("filename");
|
|
|
|
|
-// { dg-final { note-test path1 {filesystem::path "filename"} } }
|
|
|
|
|
+// { dg-final { note-test path1 {experimental::filesystem::path "filename"} } }
|
|
|
|
|
std::experimental::filesystem::path path2("/dir/.");
|
|
|
|
|
-// { dg-final { note-test path2 {filesystem::path "/dir/." = {[root-directory] = "/", [1] = "dir", [2] = "."}} } }
|
|
|
|
|
+// { dg-final { note-test path2 {experimental::filesystem::path "/dir/." = {[root-directory] = "/", [1] = "dir", [2] = "."}} } }
|
|
|
|
|
|
|
|
|
|
std::cout << "\n";
|
|
|
|
|
return 0; // Mark SPOT
|
|
|
|
|
diff --git a/libstdc++-v3/testsuite/libstdc++-prettyprinters/libfundts.cc b/libstdc++-v3/testsuite/libstdc++-prettyprinters/libfundts.cc
|
|
|
|
|
index ea13ebe71ee..7a6ee8d281e 100644
|
|
|
|
|
--- a/libstdc++-v3/testsuite/libstdc++-prettyprinters/libfundts.cc
|
|
|
|
|
+++ b/libstdc++-v3/testsuite/libstdc++-prettyprinters/libfundts.cc
|
|
|
|
|
@@ -1,8 +1,7 @@
|
|
|
|
|
// { dg-do run { target c++14 } }
|
|
|
|
|
// { dg-options "-g -O0" }
|
|
|
|
|
-// { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PROFILE" } }
|
|
|
|
|
|
|
|
|
|
-// Copyright (C) 2014-2018 Free Software Foundation, Inc.
|
|
|
|
|
+// Copyright (C) 2014-2024 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
|
|
|
|
|
@@ -19,9 +18,6 @@
|
|
|
|
|
// with this library; see the file COPYING3. If not see
|
|
|
|
|
// <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
|
|
-// Type printers only recognize the old std::string for now.
|
|
|
|
|
-#define _GLIBCXX_USE_CXX11_ABI 0
|
|
|
|
|
-
|
|
|
|
|
#include <experimental/any>
|
|
|
|
|
#include <experimental/optional>
|
|
|
|
|
#include <experimental/string_view>
|
|
|
|
|
@@ -36,22 +32,28 @@ using std::experimental::string_view;
|
|
|
|
|
int
|
|
|
|
|
main()
|
|
|
|
|
{
|
|
|
|
|
+ // Ensure debug info for std::string is issued in the local
|
|
|
|
|
+ // translation unit, so that GDB won't pick up any alternate
|
|
|
|
|
+ // std::string notion that might be present in libstdc++.so.
|
|
|
|
|
+ std::string bah = "hi";
|
|
|
|
|
+ (void)bah;
|
|
|
|
|
+
|
|
|
|
|
string_view str = "string";
|
|
|
|
|
// { dg-final { note-test str "\"string\"" } }
|
|
|
|
|
|
|
|
|
|
optional<int> o;
|
|
|
|
|
-// { dg-final { note-test o {std::experimental::optional<int> [no contained value]} } }
|
|
|
|
|
+// { dg-final { note-test o {std::experimental::optional [no contained value]} } }
|
|
|
|
|
optional<bool> ob{false};
|
|
|
|
|
-// { dg-final { note-test ob {std::experimental::optional<bool> = {[contained value] = false}} } }
|
|
|
|
|
+// { dg-final { note-test ob {std::experimental::optional = {[contained value] = false}} } }
|
|
|
|
|
optional<int> oi{5};
|
|
|
|
|
-// { dg-final { note-test oi {std::experimental::optional<int> = {[contained value] = 5}} } }
|
|
|
|
|
+// { dg-final { note-test oi {std::experimental::optional = {[contained value] = 5}} } }
|
|
|
|
|
optional<void*> op{nullptr};
|
|
|
|
|
-// { dg-final { note-test op {std::experimental::optional<void *> = {[contained value] = 0x0}} } }
|
|
|
|
|
+// { dg-final { note-test op {std::experimental::optional = {[contained value] = 0x0}} } }
|
|
|
|
|
optional<std::map<int, double>> om;
|
|
|
|
|
om = std::map<int, double>{ {1, 2.}, {3, 4.}, {5, 6.} };
|
|
|
|
|
-// { dg-final { note-test om {std::experimental::optional<std::map<int, double>> containing std::map with 3 elements = {[1] = 2, [3] = 4, [5] = 6}} } }
|
|
|
|
|
+// { dg-final { regexp-test om {std::experimental::optional containing std::(__debug::)?map with 3 elements = {\[1\] = 2, \[3\] = 4, \[5\] = 6}} } }
|
|
|
|
|
optional<std::string> os{ "stringy" };
|
|
|
|
|
-// { dg-final { note-test os {std::experimental::optional<std::string> = {[contained value] = "stringy"}} } }
|
|
|
|
|
+// { dg-final { note-test os {std::experimental::optional = {[contained value] = "stringy"}} } }
|
|
|
|
|
|
|
|
|
|
any a;
|
|
|
|
|
// { dg-final { note-test a {std::experimental::any [no contained value]} } }
|
|
|
|
|
@@ -66,7 +68,7 @@ main()
|
|
|
|
|
any as2("stringiest");
|
|
|
|
|
// { dg-final { regexp-test as2 {std::experimental::any containing const char \* = {\[contained value\] = 0x[[:xdigit:]]+ "stringiest"}} } }
|
|
|
|
|
any am = *om;
|
|
|
|
|
-// { dg-final { note-test am {std::experimental::any containing std::map with 3 elements = {[1] = 2, [3] = 4, [5] = 6}} } }
|
|
|
|
|
+// { dg-final { regexp-test am {std::experimental::any containing std::(__debug::)?map with 3 elements = {\[1\] = 2, \[3\] = 4, \[5\] = 6}} } }
|
|
|
|
|
|
|
|
|
|
std::cout << "\n";
|
|
|
|
|
return 0; // Mark SPOT
|
