re PR c/35435 (ICE with attribute tls_model in typedef)

	PR c/35435
	* c-common.c (handle_tls_model_attribute): Ignore attribute for
	non-VAR_DECLs without checking DECL_THREAD_LOCAL_P.

testsuite:
	* gcc.dg/tls/diag-6.c: New test.

From-SVN: r143963

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9b76c05faa009304739a97fd4d1368f93a06f088..c7f4ba384988d747bb75c09cc52e9a03eea6346e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-05  Joseph Myers  <joseph@codesourcery.com>
+
+       PR c/35435
+       * c-common.c (handle_tls_model_attribute): Ignore attribute for
+       non-VAR_DECLs without checking DECL_THREAD_LOCAL_P.
+
 2009-02-05  Richard Guenther  <rguenther@suse.de>
 
        Backport from mainline

diff --git a/gcc/c-common.c b/gcc/c-common.c
index 1be74b1ec42eb2724f7f66cb58fe664c7c12eab0..18b55c2e208aa06591f753586f3ca33da01fb0f3 100644 (file)
--- a/gcc/c-common.c
+++ b/gcc/c-common.c
@@ -5782,7 +5782,7 @@ handle_tls_model_attribute (tree *node, tree name, tree args,
 
   *no_add_attrs = true;
 
-  if (!DECL_THREAD_LOCAL_P (decl))
+  if (TREE_CODE (decl) != VAR_DECL || !DECL_THREAD_LOCAL_P (decl))
     {
       warning (OPT_Wattributes, "%qE attribute ignored", name);
       return NULL_TREE;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1590b1adb310202450108bc556e3448bcff30ba0..01d425f0ce022ddbdfc47a46cc75f28fda6139fb 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-05  Joseph Myers  <joseph@codesourcery.com>
+
+       PR c/35435
+       * gcc.dg/tls/diag-6.c: New test.
+
 2009-02-05  Richard Guenther  <rguenther@suse.de>
 
        Backport from mainline

diff --git a/gcc/testsuite/gcc.dg/tls/diag-6.c b/gcc/testsuite/gcc.dg/tls/diag-6.c
new file mode 100644 (file)
index 0000000..71b0b95
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tls/diag-6.c
@@ -0,0 +1,8 @@
+/* Invalid tls_model attributes.  PR 35435.  */
+/* { dg-require-effective-target tls } */
+
+int v __attribute__((tls_model("initial-exec"))); /* { dg-warning "attribute ignored" } */
+typedef int X __attribute__((tls_model("initial-exec"))); /* { dg-warning "attribute ignored" } */
+void f(int x __attribute__((tls_model("initial-exec")))); /* { dg-warning "attribute ignored" } */
+__thread int a __attribute__((tls_model(1))); /* { dg-error "tls_model argument not a string" } */
+__thread int b __attribute__((tls_model("unknown"))); /* { dg-error "tls_model argument must be one of" } */