From 209fc1e5f6c67e55e579b69f617b0b678b1bfdf0 Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Tue, 30 Jan 2024 12:07:21 -0500
Subject: [PATCH] testsuite: fix anon6 mangling [PR112846]

As with r14-6796-g2fa122cae50cd8, avoid mangling compatibility aliases in
mangling tests, and test the new mangling.

	PR c++/112846

gcc/testsuite/ChangeLog:

	* g++.dg/abi/anon6.C: Specify ABI v18.
	* g++.dg/abi/anon6a.C: New test for ABI v19.
---
 gcc/testsuite/g++.dg/abi/anon6.C               | 1 +
 gcc/testsuite/g++.dg/abi/{anon6.C => anon6a.C} | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
 copy gcc/testsuite/g++.dg/abi/{anon6.C => anon6a.C} (56%)

diff --git a/gcc/testsuite/g++.dg/abi/anon6.C b/gcc/testsuite/g++.dg/abi/anon6.C
index 7be0b0bbdb7..fd766109629 100644
--- a/gcc/testsuite/g++.dg/abi/anon6.C
+++ b/gcc/testsuite/g++.dg/abi/anon6.C
@@ -1,5 +1,6 @@
 // PR c++/108566
 // { dg-do compile { target c++20 } }
+// { dg-additional-options "-fabi-version=18 -fabi-compat-version=18" }
 
 template<typename T>
 struct wrapper1 {
diff --git a/gcc/testsuite/g++.dg/abi/anon6.C b/gcc/testsuite/g++.dg/abi/anon6a.C
similarity index 56%
copy from gcc/testsuite/g++.dg/abi/anon6.C
copy to gcc/testsuite/g++.dg/abi/anon6a.C
index 7be0b0bbdb7..69c9adb4256 100644
--- a/gcc/testsuite/g++.dg/abi/anon6.C
+++ b/gcc/testsuite/g++.dg/abi/anon6a.C
@@ -1,5 +1,6 @@
 // PR c++/108566
 // { dg-do compile { target c++20 } }
+// { dg-additional-options "-fabi-compat-version=0" }
 
 template<typename T>
 struct wrapper1 {
@@ -16,4 +17,4 @@ void uses() {
   dummy<wrapper1<double>{123.0}>();
 }
 
-// { dg-final { scan-assembler "_Z5dummyIXtl8wrapper1IdEtlNS1_Ut_Edi9RightNametlNS2_Ut_Edi9RightNameLd405ec00000000000EEEEEEvv" } }
+// { dg-final { scan-assembler "_Z5dummyITnDaXtl8wrapper1IdEtlNS1_Ut_Edi9RightNametlNS2_Ut_Edi9RightNameLd405ec00000000000EEEEEEvv" } }
-- 
2.11.4.GIT