* [PATCH] testsuite: fix allocator-opt1.C FAIL with old ABI
@ 2023-07-10 20:33 Marek Polacek
2023-07-19 19:22 ` Marek Polacek
0 siblings, 1 reply; 3+ messages in thread
From: Marek Polacek @ 2023-07-10 20:33 UTC (permalink / raw)
To: GCC Patches
Running
$ make check-g++ RUNTESTFLAGS='--target_board=unix\{-D_GLIBCXX_USE_CXX11_ABI=0,\} dg.exp=allocator-opt1.C'
yields:
FAIL: g++.dg/tree-ssa/allocator-opt1.C -std=c++98 scan-tree-dump-times gimple "struct allocator D" 1
FAIL: g++.dg/tree-ssa/allocator-opt1.C -std=c++14 scan-tree-dump-times gimple "struct allocator D" 1
FAIL: g++.dg/tree-ssa/allocator-opt1.C -std=c++17 scan-tree-dump-times gimple "struct allocator D" 1
FAIL: g++.dg/tree-ssa/allocator-opt1.C -std=c++20 scan-tree-dump-times gimple "struct allocator D" 1
=== g++ Summary for unix/-D_GLIBCXX_USE_CXX11_ABI=0 ===
=== g++ Summary for unix ===
because in the old ABI we get two "struct allocator D". This patch
follows r14-658 although I'm not quite sure I follow the logic there.
Tested on x86_64-pc-linux-gnu, ok for trunk?
gcc/testsuite/ChangeLog:
* g++.dg/tree-ssa/allocator-opt1.C: Force _GLIBCXX_USE_CXX11_ABI to 1.
---
gcc/testsuite/g++.dg/tree-ssa/allocator-opt1.C | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/gcc/testsuite/g++.dg/tree-ssa/allocator-opt1.C b/gcc/testsuite/g++.dg/tree-ssa/allocator-opt1.C
index e8394c7ad70..9f13eedb604 100644
--- a/gcc/testsuite/g++.dg/tree-ssa/allocator-opt1.C
+++ b/gcc/testsuite/g++.dg/tree-ssa/allocator-opt1.C
@@ -5,8 +5,18 @@
// Currently the dump doesn't print the allocator template arg in this context.
// { dg-final { scan-tree-dump-times "struct allocator D" 1 "gimple" } }
+// In the pre-C++11 ABI we get two allocator variables.
+#undef _GLIBCXX_USE_CXX11_ABI
+#define _GLIBCXX_USE_CXX11_ABI 1
+
+// When the library is not dual-ABI and defaults to old just compile
+// an empty TU
+#if _GLIBCXX_USE_CXX11_ABI
+
#include <string>
void f (const char *p)
{
std::string lst[] = { p, p, p, p };
}
+
+#endif
base-commit: 2d7c95e31431a297060c94697af84f498abf97a2
--
2.41.0
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] testsuite: fix allocator-opt1.C FAIL with old ABI
2023-07-10 20:33 [PATCH] testsuite: fix allocator-opt1.C FAIL with old ABI Marek Polacek
@ 2023-07-19 19:22 ` Marek Polacek
2023-07-20 17:01 ` Marek Polacek
0 siblings, 1 reply; 3+ messages in thread
From: Marek Polacek @ 2023-07-19 19:22 UTC (permalink / raw)
To: GCC Patches
Ping.
On Mon, Jul 10, 2023 at 04:33:26PM -0400, Marek Polacek via Gcc-patches wrote:
> Running
> $ make check-g++ RUNTESTFLAGS='--target_board=unix\{-D_GLIBCXX_USE_CXX11_ABI=0,\} dg.exp=allocator-opt1.C'
> yields:
>
> FAIL: g++.dg/tree-ssa/allocator-opt1.C -std=c++98 scan-tree-dump-times gimple "struct allocator D" 1
> FAIL: g++.dg/tree-ssa/allocator-opt1.C -std=c++14 scan-tree-dump-times gimple "struct allocator D" 1
> FAIL: g++.dg/tree-ssa/allocator-opt1.C -std=c++17 scan-tree-dump-times gimple "struct allocator D" 1
> FAIL: g++.dg/tree-ssa/allocator-opt1.C -std=c++20 scan-tree-dump-times gimple "struct allocator D" 1
>
> === g++ Summary for unix/-D_GLIBCXX_USE_CXX11_ABI=0 ===
>
> === g++ Summary for unix ===
>
> because in the old ABI we get two "struct allocator D". This patch
> follows r14-658 although I'm not quite sure I follow the logic there.
>
> Tested on x86_64-pc-linux-gnu, ok for trunk?
>
> gcc/testsuite/ChangeLog:
>
> * g++.dg/tree-ssa/allocator-opt1.C: Force _GLIBCXX_USE_CXX11_ABI to 1.
> ---
> gcc/testsuite/g++.dg/tree-ssa/allocator-opt1.C | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/gcc/testsuite/g++.dg/tree-ssa/allocator-opt1.C b/gcc/testsuite/g++.dg/tree-ssa/allocator-opt1.C
> index e8394c7ad70..9f13eedb604 100644
> --- a/gcc/testsuite/g++.dg/tree-ssa/allocator-opt1.C
> +++ b/gcc/testsuite/g++.dg/tree-ssa/allocator-opt1.C
> @@ -5,8 +5,18 @@
> // Currently the dump doesn't print the allocator template arg in this context.
> // { dg-final { scan-tree-dump-times "struct allocator D" 1 "gimple" } }
>
> +// In the pre-C++11 ABI we get two allocator variables.
> +#undef _GLIBCXX_USE_CXX11_ABI
> +#define _GLIBCXX_USE_CXX11_ABI 1
> +
> +// When the library is not dual-ABI and defaults to old just compile
> +// an empty TU
> +#if _GLIBCXX_USE_CXX11_ABI
> +
> #include <string>
> void f (const char *p)
> {
> std::string lst[] = { p, p, p, p };
> }
> +
> +#endif
>
> base-commit: 2d7c95e31431a297060c94697af84f498abf97a2
> --
> 2.41.0
>
Marek
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] testsuite: fix allocator-opt1.C FAIL with old ABI
2023-07-19 19:22 ` Marek Polacek
@ 2023-07-20 17:01 ` Marek Polacek
0 siblings, 0 replies; 3+ messages in thread
From: Marek Polacek @ 2023-07-20 17:01 UTC (permalink / raw)
To: GCC Patches
On Wed, Jul 19, 2023 at 03:22:10PM -0400, Marek Polacek wrote:
> Ping.
>
> On Mon, Jul 10, 2023 at 04:33:26PM -0400, Marek Polacek via Gcc-patches wrote:
> > Running
> > $ make check-g++ RUNTESTFLAGS='--target_board=unix\{-D_GLIBCXX_USE_CXX11_ABI=0,\} dg.exp=allocator-opt1.C'
> > yields:
> >
> > FAIL: g++.dg/tree-ssa/allocator-opt1.C -std=c++98 scan-tree-dump-times gimple "struct allocator D" 1
> > FAIL: g++.dg/tree-ssa/allocator-opt1.C -std=c++14 scan-tree-dump-times gimple "struct allocator D" 1
> > FAIL: g++.dg/tree-ssa/allocator-opt1.C -std=c++17 scan-tree-dump-times gimple "struct allocator D" 1
> > FAIL: g++.dg/tree-ssa/allocator-opt1.C -std=c++20 scan-tree-dump-times gimple "struct allocator D" 1
I just pushed the patch after fixing it and adding a new comment:
-- >8 --
Running
$ make check-g++ RUNTESTFLAGS='--target_board=unix\{-D_GLIBCXX_USE_CXX11_ABI=0,\} dg.exp=allocator-opt1.C'
yields:
FAIL: g++.dg/tree-ssa/allocator-opt1.C -std=c++98 scan-tree-dump-times gimple "struct allocator D" 1
FAIL: g++.dg/tree-ssa/allocator-opt1.C -std=c++14 scan-tree-dump-times gimple "struct allocator D" 1
FAIL: g++.dg/tree-ssa/allocator-opt1.C -std=c++17 scan-tree-dump-times gimple "struct allocator D" 1
FAIL: g++.dg/tree-ssa/allocator-opt1.C -std=c++20 scan-tree-dump-times gimple "struct allocator D" 1
=== g++ Summary for unix/-D_GLIBCXX_USE_CXX11_ABI=0 ===
=== g++ Summary for unix ===
because in the old ABI we get two "struct allocator D". This patch
follows r14-658 although I'm not quite sure I follow the logic there.
gcc/testsuite/ChangeLog:
* g++.dg/tree-ssa/allocator-opt1.C: Force _GLIBCXX_USE_CXX11_ABI to 1.
---
gcc/testsuite/g++.dg/tree-ssa/allocator-opt1.C | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/gcc/testsuite/g++.dg/tree-ssa/allocator-opt1.C b/gcc/testsuite/g++.dg/tree-ssa/allocator-opt1.C
index e8394c7ad70..51c470dee37 100644
--- a/gcc/testsuite/g++.dg/tree-ssa/allocator-opt1.C
+++ b/gcc/testsuite/g++.dg/tree-ssa/allocator-opt1.C
@@ -5,8 +5,20 @@
// Currently the dump doesn't print the allocator template arg in this context.
// { dg-final { scan-tree-dump-times "struct allocator D" 1 "gimple" } }
+// In the pre-C++11 ABI we get two allocator variables.
+#undef _GLIBCXX_USE_CXX11_ABI
+#define _GLIBCXX_USE_CXX11_ABI 1
+
#include <string>
+
+// When the library is not dual-ABI and defaults to old just compile
+// an empty TU. NB: We test _GLIBCXX_USE_CXX11_ABI again because the
+// #include above might have undef'd _GLIBCXX_USE_CXX11_ABI.
+#if _GLIBCXX_USE_CXX11_ABI
+
void f (const char *p)
{
std::string lst[] = { p, p, p, p };
}
+
+#endif
base-commit: 506f068e7d01ad2fb107185b8fb204a0ec23785c
--
2.41.0
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-07-20 17:01 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-07-10 20:33 [PATCH] testsuite: fix allocator-opt1.C FAIL with old ABI Marek Polacek
2023-07-19 19:22 ` Marek Polacek
2023-07-20 17:01 ` Marek Polacek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).