Re: testsuite: Be more informative for ICEs

[Martin Sebor <msebor@gmail.com>]

On 12/10/21 3:42 PM, Thomas Schwinge wrote:
> Hi!
> 
> OK to push the attached "testsuite: Be more informative for ICEs"?

Adding more detail here seems like a useful improvement to me.

Martin

> 
> 
> Grüße
>   Thomas
> 
> 
> -----------------
> Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955
> 
> 
> 0001-testsuite-Be-more-informative-for-ICEs.patch
> 
>  From 5ffc2cfc9c6ec6ed0937311377118efd648f0297 Mon Sep 17 00:00:00 2001
> From: Thomas Schwinge<thomas@codesourcery.com>
> Date: Fri, 10 Dec 2021 19:08:26 +0100
> Subject: [PATCH] testsuite: Be more informative for ICEs
> 
> For example, for the two (FAIL, XFAIL)
> 'gcc/testsuite/lib/gcc-dg.exp:gcc-dg-test-1' cases:
> 
>      -FAIL: g++.dg/modules/xtreme-header-3_a.H -std=c++17 (internal compiler error)
>      +FAIL: g++.dg/modules/xtreme-header-3_a.H -std=c++17 (internal compiler error: tree check: expected var_decl or function_decl or field_decl or type_decl or concept_decl or template_decl, have namespace_decl in get_merge_kind, at cp/module.cc:10072)
> 
>      -FAIL: gfortran.dg/gomp/clauses-1.f90   -O  (internal compiler error)
>      +FAIL: gfortran.dg/gomp/clauses-1.f90   -O  (internal compiler error: Segmentation fault)
> 
>      -XFAIL: c-c++-common/goacc/kernels-decompose-ice-1.c (internal compiler error)
>      +XFAIL: c-c++-common/goacc/kernels-decompose-ice-1.c (internal compiler error: in lower_omp_target, at omp-low.c:13147)
> 
>      -XFAIL: g++.dg/cpp1z/constexpr-lambda26.C  -std=c++17 (internal compiler error)
>      +XFAIL: g++.dg/cpp1z/constexpr-lambda26.C  -std=c++17 (internal compiler error: in cxx_eval_constant_expression, at cp/constexpr.c:6954)
> 
> That allows for more easily spotting when during development you're trading one
> ICE for another.
> 
> 	gcc/testsuite/
> 	* lib/fortran-torture.exp (fortran-torture-compile)
> 	(fortran-torture-execute): Be more informative for ICEs.
> 	* lib/gcc-defs.exp (${tool}_check_compile): Likewise.
> 	* lib/gcc-dg.exp (gcc-dg-test-1): Likewise.
> 	* lib/go-torture.exp (go-torture-compile, go-torture-execute):
> 	Likewise.
> ---
>   gcc/testsuite/lib/fortran-torture.exp | 8 ++++----
>   gcc/testsuite/lib/gcc-defs.exp        | 4 ++--
>   gcc/testsuite/lib/gcc-dg.exp          | 6 +++---
>   gcc/testsuite/lib/go-torture.exp      | 8 ++++----
>   4 files changed, 13 insertions(+), 13 deletions(-)
> 
> diff --git a/gcc/testsuite/lib/fortran-torture.exp b/gcc/testsuite/lib/fortran-torture.exp
> index d6759aa0b4b..11d73d9f1f7 100644
> --- a/gcc/testsuite/lib/fortran-torture.exp
> +++ b/gcc/testsuite/lib/fortran-torture.exp
> @@ -138,8 +138,8 @@ proc fortran-torture-compile { src option } {
>   	return
>       }
>   
> -    if [string match "*internal compiler error*" $comp_output] then {
> -	gfortran_fail $testcase "$option (internal compiler error)"
> +    if [regexp -line -- "internal compiler error.*" $comp_output ice] then {
> +	gfortran_fail $testcase "$option ($ice)"
>   	catch { remote_file build delete $output }
>   	return
>       }
> @@ -263,8 +263,8 @@ proc fortran-torture-execute { src } {
>   	    continue
>   	}
>   
> -	if [string match "*internal compiler error*" $comp_output] then {
> -	    gfortran_fail $testcase "$option (internal compiler error)"
> +	if [regexp -line -- "internal compiler error.*" $comp_output ice] then {
> +	    gfortran_fail $testcase "$option ($ice)"
>   	    catch { remote_file build delete $executable }
>   	    continue
>   	}
> diff --git a/gcc/testsuite/lib/gcc-defs.exp b/gcc/testsuite/lib/gcc-defs.exp
> index d17308d0f86..66df4e1c6aa 100644
> --- a/gcc/testsuite/lib/gcc-defs.exp
> +++ b/gcc/testsuite/lib/gcc-defs.exp
> @@ -38,8 +38,8 @@ proc ${tool}_check_compile {testcase option objname gcc_output} {
>   	return 0
>       }
>   
> -    if [string match "*internal compiler error*" $gcc_output] then {
> -	${tool}_fail $testcase "$option (internal compiler error)"
> +    if [regexp -line -- "internal compiler error.*" $gcc_output ice] then {
> +	${tool}_fail $testcase "$option ($ice)"
>   	return 0
>       }
>   
> diff --git a/gcc/testsuite/lib/gcc-dg.exp b/gcc/testsuite/lib/gcc-dg.exp
> index 78a6c3651ef..464059608b8 100644
> --- a/gcc/testsuite/lib/gcc-dg.exp
> +++ b/gcc/testsuite/lib/gcc-dg.exp
> @@ -315,13 +315,13 @@ proc gcc-dg-test-1 { target_compile prog do_what extra_tool_flags } {
>       # to avoid a second failure for excess errors.
>       # "Error reporting routines re-entered" ICE says "Internal" rather than
>       # "internal", so match that too.
> -    if [string match {*[Ii]nternal compiler error*} $comp_output] {
> +    if [regexp -line -- {[Ii]nternal compiler error.*} $comp_output ice] {
>   	upvar 2 name name
>   	if { $expect_ice == 0 } {
> -	  fail "$name (internal compiler error)"
> +	  fail "$name ($ice)"
>   	} else {
>   	  # We expected an ICE and we got it.
> -	  xfail "$name (internal compiler error)"
> +	  xfail "$name ($ice)"
>   	  # Prune the ICE from the output.
>   	  set comp_output [prune_ices $comp_output]
>   	}
> diff --git a/gcc/testsuite/lib/go-torture.exp b/gcc/testsuite/lib/go-torture.exp
> index 28247a1902d..adeae36f916 100644
> --- a/gcc/testsuite/lib/go-torture.exp
> +++ b/gcc/testsuite/lib/go-torture.exp
> @@ -88,8 +88,8 @@ proc go-torture-compile { src option } {
>   	return
>       }
>   
> -    if [string match "*internal compiler error*" $comp_output] then {
> -	go_fail $testcase "$option (internal compiler error)"
> +    if [regexp -line -- "internal compiler error.*" $comp_output ice] then {
> +	go_fail $testcase "$option ($ice)"
>   	catch { remote_file build delete $output }
>   	return
>       }
> @@ -224,8 +224,8 @@ proc go-torture-execute { src } {
>   	    continue
>   	}
>   
> -	if [string match "*internal compiler error*" $comp_output] then {
> -	    go_fail $testcase "$option (internal compiler error)"
> +	if [regexp -line -- "internal compiler error.*" $comp_output ice] then {
> +	    go_fail $testcase "$option ($ice)"
>   	    catch { remote_file build delete $executable }
>   	    continue
>   	}
> -- 2.25.1
>