From b476f5dd5d5aef9b150ad5d71dc46fd0b6207f73 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Thu, 1 Mar 2018 13:39:56 +0000 Subject: [PATCH] re PR debug/84645 (-flto -g0 at compile-time vs. -flto -g at link time ICEs in add_dwarf_attr, at dwarf2out.c:4353) 2018-03-01 Richard Biener PR debug/84645 * dwarf2out.c (gen_variable_die): Properly handle late VLA type annotation with LTO when debug was disabled at compile-time. * gfortran.dg/lto/pr84645_0.f90: New testcase. From-SVN: r258100 --- gcc/ChangeLog | 6 ++++++ gcc/dwarf2out.c | 6 ++++-- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gfortran.dg/lto/pr84645_0.f90 | 17 +++++++++++++++++ 4 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/lto/pr84645_0.f90 diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 447ea67aaf9..87969433118 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2018-03-01 Richard Biener + + PR debug/84645 + * dwarf2out.c (gen_variable_die): Properly handle late VLA + type annotation with LTO when debug was disabled at compile-time. + 2018-03-01 Matthew Fortune * config/mips/mips.c (mips_final_prescan_insn): Fix incorrect diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c index 5e88c7bacf0..41bb11558f6 100644 --- a/gcc/dwarf2out.c +++ b/gcc/dwarf2out.c @@ -23527,10 +23527,12 @@ gen_variable_die (tree decl, tree origin, dw_die_ref context_die) /* ??? In LTRANS we cannot annotate early created variably modified type DIEs without copying them and adjusting all - references to them. Thus we dumped them again, also add a - reference to them. */ + references to them. Thus we dumped them again. Also add a + reference to them but beware of -g0 compile and -g link + in which case the reference will be already present. */ tree type = TREE_TYPE (decl_or_origin); if (in_lto_p + && ! get_AT (var_die, DW_AT_type) && variably_modified_type_p (type, decl_function_context (decl_or_origin))) { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index e4ed421e7be..a9e12bef2b4 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-03-01 Richard Biener + + PR debug/84645 + * gfortran.dg/lto/pr84645_0.f90: New testcase. + 2018-03-01 Paul Thomas PR fortran/84219 diff --git a/gcc/testsuite/gfortran.dg/lto/pr84645_0.f90 b/gcc/testsuite/gfortran.dg/lto/pr84645_0.f90 new file mode 100644 index 00000000000..99356246ab9 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/lto/pr84645_0.f90 @@ -0,0 +1,17 @@ +! { dg-lto-do link } +! { dg-lto-options { { -flto -g0 } } } +! { dg-extra-ld-options { -g } } +program nml_test + implicit none + type t + integer :: c1 + integer :: c2(3) + end type t + call test2(2) +contains + subroutine test2(n) + integer :: n + type(t) :: x12(n) + namelist /nml2/ x12 + end subroutine test2 +end program nml_test -- 2.30.2