[pushed] [gdb/testsuite] Fix gdb.gdb/python-helper.exp with -O2 -flto=auto and gcc 7.5.0 some more

[Tom de Vries <tdevries@suse.de>]

With a gdb build with -O2 -flto=auto and gcc 7.5.0 and test-case
gdb.gdb/python-helper.exp I run into:
...
(outer-gdb) continue^M
Continuing.^M
print 1^M
^M
Thread 1 "xgdb" hit Breakpoint 2, \
  _Z11value_printP5valueP7ui_filePK19value_print_options (val=0x22e2590, \
  stream=0x1f65480, options=0x7fffffffcdc0) at gdb/valprint.c:1193^M
1193    {^M
(outer-gdb) FAIL: gdb.gdb/python-helper.exp: hit breakpoint in outer gdb
...

This is the "value_print" variant of the problem with "c_print_type" I fixed
in commit 0d332f11122 ("[gdb/testsuite] Fix gdb.gdb/python-helper.exp with -O2
 -flto=auto and gcc 7.5.0").

Fix this likewise.

Tested on x86_64-linux.
---
 gdb/testsuite/gdb.gdb/python-helper.exp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/gdb/testsuite/gdb.gdb/python-helper.exp b/gdb/testsuite/gdb.gdb/python-helper.exp
index 719c3975f5d..a5d8308e4e5 100644
--- a/gdb/testsuite/gdb.gdb/python-helper.exp
+++ b/gdb/testsuite/gdb.gdb/python-helper.exp
@@ -69,6 +69,12 @@ proc test_python_helper {} {
     gdb_breakpoint value_print qualified
     gdb_breakpoint c_print_type qualified
 
+    # With gdb build with -O2 -flto=auto and gcc 7.5.0, we can get the mangled
+    # names due to a problem in the debug info, so we work around this by less
+    # strict matching.
+    set fn_name_value_print "\[^\r\n\]*value_print\[^\r\n\]*"
+    set fn_name_c_print_type "\[^\r\n\]*c_print_type\[^\r\n\]*"
+
     # Disable all breakpoints until after we have loaded the test
     # binary into the inner GDB.
     gdb_test_no_output "disable breakpoints"
@@ -125,7 +131,7 @@ proc test_python_helper {} {
     # breakpoints we created..
     send_inferior "print 1\n"
     gdb_test -prompt $outer_prompt_re "" \
-	"Breakpoint $bkptno_numopt_re, value_print.*" \
+	"Breakpoint $bkptno_numopt_re, $fn_name_value_print.*" \
 	"hit breakpoint in outer gdb"
 
     # Now inspect the type of parameter VAL, this should trigger the
@@ -165,7 +171,7 @@ proc test_python_helper {} {
     # information.
     send_inferior "print global_c.m_val\n"
     gdb_test -prompt $outer_prompt_re "" \
-	"Breakpoint $bkptno_numopt_re, value_print.*" \
+	"Breakpoint $bkptno_numopt_re, $fn_name_value_print.*" \
 	"print integer from DWARF info"
 
     set answer [multi_line \
@@ -193,12 +199,8 @@ proc test_python_helper {} {
     send_inferior "ptype global_c\n"
     set test "hit breakpoint in outer gdb again"
     set in_outer_gdb 0
-    # With gdb build with -O2 -flto=auto and gcc 7.5.0, we get the mangled
-    # name of c_print_type due to a problem in the debug info, so we work
-    # around this by less strict matching.
-    set fn_name "\[^\r\n\]*c_print_type\[^\r\n\]*"
     gdb_test_multiple "" $test  -prompt $outer_prompt_re {
-	-re -wrap "Breakpoint $bkptno_numopt_re, $fn_name.*" {
+	-re -wrap "Breakpoint $bkptno_numopt_re, $fn_name_c_print_type.*" {
 	    pass $gdb_test_name
 	    set in_outer_gdb 1
 	}

base-commit: c0afd99439fea90c1e93e5add7eac06cf533bb3e
-- 
2.35.3