* c-decl.c (duplicate_decls): Error out for incompatible TLS

        declarations.

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

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@56084 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 23f8caa..3aa4333 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2002-08-06  Aldy Hernandez  <aldyh@redhat.com>
+
+        * c-decl.c (duplicate_decls): Error out for incompatible TLS
+        declarations.
+
+        * testsuite/gcc.dg/tls/diag-3.c: New.
+
 2002-08-06  Jason Merrill  <jason@redhat.com>
 
        * c-common.c (c_expand_expr) [STMT_EXPR]: If the last expression is

diff --git a/gcc/c-decl.c b/gcc/c-decl.c
index aed707d..4adbe69 100644 (file)
--- a/gcc/c-decl.c
+++ b/gcc/c-decl.c
@@ -1400,6 +1400,20 @@ duplicate_decls (newdecl, olddecl, different_binding_level)
        }
       error_with_decl (olddecl, "previous declaration of `%s'");
     }
+  /* TLS cannot follow non-TLS declaration.  */
+  else if (TREE_CODE (olddecl) == VAR_DECL && TREE_CODE (newdecl) == VAR_DECL
+          && !DECL_THREAD_LOCAL (olddecl) && DECL_THREAD_LOCAL (newdecl))
+    {
+      error_with_decl (newdecl, "thread-local declaration of `%s' follows non thread-local declaration");
+      error_with_decl (olddecl, "previous declaration of `%s'");
+    }
+  /* non-TLS declaration cannot follow TLS declaration.  */
+  else if (TREE_CODE (olddecl) == VAR_DECL && TREE_CODE (newdecl) == VAR_DECL
+          && DECL_THREAD_LOCAL (olddecl) && !DECL_THREAD_LOCAL (newdecl))
+    {
+      error_with_decl (newdecl, "non thread-local declaration of `%s' follows thread-local declaration");
+      error_with_decl (olddecl, "previous declaration of `%s'");
+    }
   else
     {
       errmsg = redeclaration_error_message (newdecl, olddecl);

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0acf870..58171e0 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-06  Aldy Hernandez  <aldyh@redhat.com>
+
+        * testsuite/gcc.dg/tls/diag-3.c: New.
+
 2002-08-07  Gabriel Dos Reis  <gdr@nerim.net>
 
        * g++.dg/README (Subdirectories): Document new subdir expr.

diff --git a/gcc/testsuite/gcc.dg/tls/diag-3.c b/gcc/testsuite/gcc.dg/tls/diag-3.c
new file mode 100644 (file)
index 0000000..c23b141
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tls/diag-3.c
@@ -0,0 +1,10 @@
+/* Report invalid extern and __thread combinations.  */
+
+extern int j;          /* { dg-error "previous declaration" } */
+__thread int j;                /* { dg-error "thread-local declaration for" } */
+
+extern __thread int i; /* { dg-error "previous declaration" } */
+int i;                 /* { dg-error "non thread-local" } */
+
+extern __thread int k; /* This is fine.  */
+__thread int k;