From: Alexandre Oliva <oliva@adacore.com>
Date: Mon, 17 Feb 2020 20:08:11 +0000 (-0300)
Subject: Do not call null register_common in emutls
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=96bae436e0cb2b3e14ea7f16854e1b535a72ca66;p=gcc.git

Do not call null register_common in emutls

Thread-local variables with DECL_COMMON trigger an internal compiler
error on targets that use emulated TLS without register_common, when
we attempt to expand a call to the NULL register_common, with
testcases as simple as gcc.dg/tls/emutls-2.c.

The documentation states that, on such targets, common variables would
fall back to explicitly initialized.  This patch rearranges the code
that deals with initialization of common and non-common variables,
complementing code that is already in place to detect
register_common-less targets.


for  gcc/ChangeLog

	* tree-emutls.c (new_emutls_decl, emutls_common_1): Complete
	handling of register_common-less targets.

for  gcc/testsuite/ChangeLog

	* gcc.dg/tls/emutls-3.c: New, combining emutls-2.c and
	thr-init-2.c into an execution test with explicitly common
	variables.
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ef968492ee1..a07e536789f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2020-02-17  Alexandre Oliva <oliva@adacore.com>
+
+	* tree-emutls.c (new_emutls_decl, emutls_common_1): Complete
+	handling of register_common-less targets.
+
 2020-02-17  Martin Liska  <mliska@suse.cz>
 
 	PR ipa/93760
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1b6c566ac84..2e8d92221db 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2020-02-17  Alexandre Oliva <oliva@adacore.com>
+
+	* gcc.dg/tls/emutls-3.c: New, combining emutls-2.c and
+	thr-init-2.c into an execution test with explicitly common
+	variables.
+
 2020-02-17  Wilco Dijkstra  <wdijkstr@arm.com>
 
 	* gcc.target/aarch64/pr93565.c: Fix test for ilp32.
diff --git a/gcc/testsuite/gcc.dg/tls/emutls-3.c b/gcc/testsuite/gcc.dg/tls/emutls-3.c
new file mode 100644
index 00000000000..e062ba8f2a3
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tls/emutls-3.c
@@ -0,0 +1,26 @@
+/* { dg-do run } */
+/* { dg-require-effective-target tls } */
+/* { dg-require-effective-target global_constructor } */
+/* { dg-options "-O2" } */
+/* { dg-require-effective-target tls_runtime } */
+/* { dg-add-options tls } */
+
+__thread int i __attribute__((common));
+
+extern void abort (void);
+
+int test_code(int b)
+{
+  i += b ;
+  return i;
+}
+
+int main (int ac, char *av[])
+{
+  int a = test_code(test_code(1));
+  
+  if ((a != 2) || (i != 2))
+    abort () ;
+  
+  return 0;
+}
diff --git a/gcc/tree-emutls.c b/gcc/tree-emutls.c
index e9241243f23..44755dd406a 100644
--- a/gcc/tree-emutls.c
+++ b/gcc/tree-emutls.c
@@ -322,7 +322,7 @@ new_emutls_decl (tree decl, tree alias_of)
      control structure with size and alignment information.  Initialization
      of COMMON block variables happens elsewhere via a constructor.  */
   if (!DECL_EXTERNAL (to)
-      && (!DECL_COMMON (to)
+      && (!DECL_COMMON (to) || !targetm.emutls.register_common
           || (DECL_INITIAL (decl)
               && DECL_INITIAL (decl) != error_mark_node)))
     {
@@ -360,7 +360,7 @@ emutls_common_1 (tree tls_decl, tree control_decl, tree *pstmts)
   tree x;
   tree word_type_node;
 
-  if (! DECL_COMMON (tls_decl)
+  if (!DECL_COMMON (tls_decl) || !targetm.emutls.register_common
       || (DECL_INITIAL (tls_decl)
 	  && DECL_INITIAL (tls_decl) != error_mark_node))
     return;