FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

c++: Fix handling of __thread/thread_local extern vars declared at function scope [PR102496]

Browse source 
The introduction of push_local_extern_decl_alias in
r11-3699-g4e62aca0e0520e4ed2532f2d8153581190621c1a
broke tls vars, while the decl they are created for has the tls model
set properly, nothing sets it for the alias that is actually used,
so accesses to it are done as if they were normal variables.
This is then diagnosed at link time if the definition of the extern
vars is __thread/thread_local.

2021-10-01  Jakub Jelinek  <jakub@redhat.com>

	PR c++/102496
	* name-lookup.c (push_local_extern_decl_alias): Return early even for
	tls vars with non-dependent type when processing_template_decl.  For
	CP_DECL_THREAD_LOCAL_P vars call set_decl_tls_model on alias.

	* g++.dg/tls/pr102496-1.C: New test.
	* g++.dg/tls/pr102496-2.C: New test.
This commit is contained in:
Jakub Jelinek 2021-10-01 10:30:16 +02:00
parent 3a7f20ed26
commit 701075864a
3 changed files with 32 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gcc/cp/name-lookup.c
View file

@ -3375,7 +3375,10 @@ set_decl_context_in_fn (tree ctx, tree decl)
void
push_local_extern_decl_alias (tree decl)
{
if (dependent_type_p (TREE_TYPE (decl)))
if (dependent_type_p (TREE_TYPE (decl))
|| (processing_template_decl
&& VAR_P (decl)
&& CP_DECL_THREAD_LOCAL_P (decl)))
return;
/* EH specs were not part of the function type prior to c++17, but
we still can't go pushing dependent eh specs into the namespace. */
@ -3471,6 +3474,8 @@ push_local_extern_decl_alias (tree decl)
push_nested_namespace (ns);
alias = do_pushdecl (alias, /* hiding= */true);
pop_nested_namespace (ns);
if (VAR_P (decl) && CP_DECL_THREAD_LOCAL_P (decl))
set_decl_tls_model (alias, DECL_TLS_MODEL (decl));
}
}

20
gcc/testsuite/g++.dg/tls/pr102496-1.C Normal file
View file

@ -0,0 +1,20 @@
// PR c++/102496
// { dg-do link { target c++11 } }
// { dg-require-effective-target tls }
// { dg-add-options tls }
// { dg-additional-sources pr102496-2.C }
template <int N>
int
foo ()
{
extern __thread int t1;
return t1;
}
int
main ()
{
extern __thread int t2;
return foo <0> () + t2;
}

6
gcc/testsuite/g++.dg/tls/pr102496-2.C Normal file
View file

@ -0,0 +1,6 @@
// PR c++/102496
// { dg-do compile { target c++11 } }
// { dg-require-effective-target tls }
__thread int t1;
__thread int t2;