From 5b018c651a9ba855b19e60ad354c21400cc343a2 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Sun, 22 May 2011 00:40:55 -0400 Subject: [PATCH] re PR c++/49092 (ice in tree_add_const_value_attribute) PR c++/49092 * dwarf2out.c (tree_add_const_value_attribute_for_decl): Check for static storage duration. From-SVN: r174024 --- gcc/ChangeLog | 6 ++++++ gcc/dwarf2out.c | 4 +++- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/g++.dg/debug/const5.C | 13 +++++++++++++ 4 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/debug/const5.C diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 80233d7eff9..789f258da39 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2011-05-21 Jason Merrill + + PR c++/49092 + * dwarf2out.c (tree_add_const_value_attribute_for_decl): Check for + static storage duration. + 2011-05-21 Eric Botcazou * config/sparc/sparc.md (setjmp): Handle PIC mode and use the hard diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c index b85a55ec67c..55453a3622c 100644 --- a/gcc/dwarf2out.c +++ b/gcc/dwarf2out.c @@ -17719,7 +17719,9 @@ tree_add_const_value_attribute_for_decl (dw_die_ref var_die, tree decl) if (!decl || (TREE_CODE (decl) != VAR_DECL - && TREE_CODE (decl) != CONST_DECL)) + && TREE_CODE (decl) != CONST_DECL) + || (TREE_CODE (decl) == VAR_DECL + && !TREE_STATIC (decl))) return false; if (TREE_READONLY (decl) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 61afdb00e2e..ccc34a7bae3 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2011-05-21 Jason Merrill + + * g++.dg/debug/const5.C: New. + 2011-05-20 Jason Merrill * g++.dg/cpp0x/constexpr-static7.C: Extend. diff --git a/gcc/testsuite/g++.dg/debug/const5.C b/gcc/testsuite/g++.dg/debug/const5.C new file mode 100644 index 00000000000..e5387ea20ef --- /dev/null +++ b/gcc/testsuite/g++.dg/debug/const5.C @@ -0,0 +1,13 @@ +// PR c++/49092 + +struct A +{ + A(); +}; + +int i; + +A::A() +{ + const int j = i; +}