procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

testsuite: Be more informative for ICEs

Browse source 
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.
This commit is contained in:
Thomas Schwinge 2021-12-10 19:08:26 +01:00
parent 4a5e71f234
commit 45b768cb80
4 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gcc/testsuite/lib/fortran-torture.exp
View file

@ -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
}

4
gcc/testsuite/lib/gcc-defs.exp
View file

@ -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
}

6
gcc/testsuite/lib/gcc-dg.exp
View file

@ -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]
}

8
gcc/testsuite/lib/go-torture.exp
View file

@ -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
}