These two tests have started to fail with the old std::string ABI. The scan-assembler-not checks fail because they match debug info, not code.
Adding -g0 to the test flags fixes them. libstdc++-v3/ChangeLog: * testsuite/21_strings/basic_string/modifiers/assign/char/move_assign_optim.cc: Do not generate debug info. * testsuite/21_strings/basic_string/modifiers/assign/wchar_t/move_assign_optim.cc: Likewise. Tested powerpc64le-linux. Committed to trunk.
commit 2b9c09a78b048328e41419e6b941cf0207bfd6bc Author: Jonathan Wakely <jwak...@redhat.com> Date: Wed Oct 14 16:15:49 2020 libstdc++: Fix tests that fail with old std::string ABI These two tests have started to fail with the old std::string ABI. The scan-assembler-not checks fail because they match debug info, not code. Adding -g0 to the test flags fixes them. libstdc++-v3/ChangeLog: * testsuite/21_strings/basic_string/modifiers/assign/char/move_assign_optim.cc: Do not generate debug info. * testsuite/21_strings/basic_string/modifiers/assign/wchar_t/move_assign_optim.cc: Likewise. diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/char/move_assign_optim.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/char/move_assign_optim.cc index 85584d68e47..9546ca68e4d 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/char/move_assign_optim.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/char/move_assign_optim.cc @@ -15,7 +15,7 @@ // with this library; see the file COPYING3. If not see // <http://www.gnu.org/licenses/>. -// { dg-options "-O1" } +// { dg-options "-O1 -g0" } // { dg-do compile { target c++11 } } // { dg-final { scan-assembler-not "__throw_length_error" } } // { dg-final { scan-assembler-not "__throw_bad_alloc" } } diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/wchar_t/move_assign_optim.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/wchar_t/move_assign_optim.cc index 9f0a86f3dff..752856b800d 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/wchar_t/move_assign_optim.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/wchar_t/move_assign_optim.cc @@ -15,7 +15,7 @@ // with this library; see the file COPYING3. If not see // <http://www.gnu.org/licenses/>. -// { dg-options "-O1" } +// { dg-options "-O1 -g0" } // { dg-do compile { target c++11 } } // { dg-final { scan-assembler-not "__throw_length_error" } } // { dg-final { scan-assembler-not "__throw_bad_alloc" } }