diff options
| author | Paolo Carlini <paolo@gcc.gnu.org> | 2013-01-09 14:43:50 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2013-01-09 14:43:50 +0000 |
| commit | fdbff37f390c9bb60794be943acb898159717834 (patch) | |
| tree | 7ee3571a404ca61b085d951e2c2b45b35989eb13 /gcc/cp | |
| parent | f0d5414883f580b91d88025c4c8c8863321048f7 (diff) | |
| download | gcc-fdbff37f390c9bb60794be943acb898159717834.zip gcc-fdbff37f390c9bb60794be943acb898159717834.tar.gz gcc-fdbff37f390c9bb60794be943acb898159717834.tar.bz2 | |
re PR c++/55801 (ICE with thread_local after ill-formed declaration)
/cp
2013-01-09 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/55801
* decl2.c (var_needs_tls_wrapper): Return false when error_operand_p
of the argument is true.
/testsuite
2013-01-09 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/55801
* g++.dg/tls/thread_local-ice.C: New.
From-SVN: r195050
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/decl2.c | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 49e924d..4658353 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2013-01-09 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/55801 + * decl2.c (var_needs_tls_wrapper): Return false when error_operand_p + of the argument is true. + 2013-01-08 Joel Brobecker <brobecker@adacore.com> * parser.c (cp_parser_initializer_list): Move declaration diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index c5de37e..074cf37 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -1,7 +1,7 @@ /* Process declarations and variables for C++ compiler. Copyright (C) 1988, 1992, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010, - 2011, 2012 Free Software Foundation, Inc. + 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007-2013 + Free Software Foundation, Inc. Hacked by Michael Tiemann (tiemann@cygnus.com) This file is part of GCC. @@ -2807,7 +2807,8 @@ var_defined_without_dynamic_init (tree var) static bool var_needs_tls_wrapper (tree var) { - return (DECL_THREAD_LOCAL_P (var) + return (!error_operand_p (var) + && DECL_THREAD_LOCAL_P (var) && !DECL_GNU_TLS_P (var) && !DECL_FUNCTION_SCOPE_P (var) && !var_defined_without_dynamic_init (var)); |