re PR middle-end/58624 (gcc internal compiler error: Segmentaion fault in insert_to_a...

	PR c++/58624
	* pt.c (tsubst_copy_and_build) [VAR_DECL]: Use TLS wrapper.
	* semantics.c (finish_id_expression): Don't call TLS wrapper in a
	template.

From-SVN: r216273

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 82e61f5f6b7e13a396cc6d9594c48d73e8eed895..d289bba4f328feb8a57ff81931918fc2c17018e6 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2014-10-15  Jason Merrill  <jason@redhat.com>
+
+       PR c++/58624
+       * pt.c (tsubst_copy_and_build) [VAR_DECL]: Use TLS wrapper.
+       * semantics.c (finish_id_expression): Don't call TLS wrapper in a
+       template.
+
 2014-08-07  Jason Merrill  <jason@redhat.com>
 
        PR c++/61959

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index c03af2e93e0883d5d8ecf548681246702c91a575..83aedd78dba8789904129760f5d15cda7eeeef74 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -14499,6 +14499,16 @@ tsubst_copy_and_build (tree t,
     case PARM_DECL:
       {
        tree r = tsubst_copy (t, args, complain, in_decl);
+       if (TREE_CODE (r) == VAR_DECL
+           && !processing_template_decl
+           && !cp_unevaluated_operand
+           && DECL_THREAD_LOCAL_P (r))
+         {
+           if (tree wrap = get_tls_wrapper_fn (r))
+             /* Replace an evaluated use of the thread_local variable with
+                a call to its wrapper.  */
+             r = build_cxx_call (wrap, 0, NULL, tf_warning_or_error);
+         }
 
        if (TREE_CODE (TREE_TYPE (t)) != REFERENCE_TYPE)
          /* If the original type was a reference, we'll be wrapped in

diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 9825dbe6aa4003b788726aee40a3a70a34d6f87c..cc9c550e19ccbcd0a0c5214e69f96c5115e7547b 100644 (file)
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -3343,6 +3343,7 @@ finish_id_expression (tree id_expression,
       tree wrap;
       if (TREE_CODE (decl) == VAR_DECL
          && !cp_unevaluated_operand
+         && !processing_template_decl
          && DECL_THREAD_LOCAL_P (decl)
          && (wrap = get_tls_wrapper_fn (decl)))
        {

diff --git a/gcc/testsuite/g++.dg/tls/thread_local10.C b/gcc/testsuite/g++.dg/tls/thread_local10.C
new file mode 100644 (file)
index 0000000..48c1b86
--- /dev/null
+++ b/gcc/testsuite/g++.dg/tls/thread_local10.C
@@ -0,0 +1,23 @@
+// PR c++/58624
+
+// { dg-do run { target c++11 } }
+// { dg-add-options tls }
+// { dg-require-effective-target tls_runtime }
+
+int i;
+
+template <typename> struct A
+{
+  static thread_local int s;
+
+  A () { i = s; }
+};
+
+int f() { return 42; }
+template <typename T> thread_local int A<T>::s = f();
+
+int main () {
+  A<void> a;
+  if (i != 42)
+    __builtin_abort();
+}