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
