From: Richard Biener <rguenther@suse.de>
Date: Wed, 23 Apr 2014 08:27:00 +0000 (+0000)
Subject: re PR tree-optimization/60895 (error: address taken, but ADDRESSABLE bit not set)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=62ba699e011766b66e7d19d03f59afdda55d90e3;p=gcc.git

re PR tree-optimization/60895 (error: address taken, but ADDRESSABLE bit not set)

2014-04-23  Richard Biener  <rguenther@suse.de>

	PR middle-end/60895
	* tree-inline.c (declare_return_variable): Use mark_addressable.

	* g++.dg/torture/pr60895.C: New testcase.

From-SVN: r209675
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bac9f35fa7e..9f8200fcca4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-23  Richard Biener  <rguenther@suse.de>
+
+	PR middle-end/60895
+	* tree-inline.c (declare_return_variable): Use mark_addressable.
+
 2014-04-23  Richard Biener  <rguenther@suse.de>
 
 	PR middle-end/60891
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8f1bfc6bee3..d05337748b0 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-23  Richard Biener  <rguenther@suse.de>
+
+	PR middle-end/60895
+	* g++.dg/torture/pr60895.C: New testcase.
+
 2014-04-23  Richard Biener  <rguenther@suse.de>
 
 	PR middle-end/60891
diff --git a/gcc/testsuite/g++.dg/torture/pr60895.C b/gcc/testsuite/g++.dg/torture/pr60895.C
new file mode 100644
index 00000000000..0edd36ada16
--- /dev/null
+++ b/gcc/testsuite/g++.dg/torture/pr60895.C
@@ -0,0 +1,32 @@
+// { dg-do compile }
+
+struct C
+{
+  double elems[3];
+};
+
+C
+foo ()
+{
+  C a;
+  double *f = a.elems;
+  int b;
+  for (; b;)
+    {
+      *f = 0;
+      ++f;
+    }
+  return a;
+}
+
+struct J
+{
+  C c;
+  __attribute__((always_inline)) J () : c (foo ()) {}
+};
+
+void
+bar ()
+{
+  J ();
+}
diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c
index a0832b4e7d4..802d25fd71a 100644
--- a/gcc/tree-inline.c
+++ b/gcc/tree-inline.c
@@ -3120,7 +3120,8 @@ declare_return_variable (copy_body_data *id, tree return_slot, tree modify_dest,
 	{
 	  var = return_slot;
 	  gcc_assert (TREE_CODE (var) != SSA_NAME);
-	  TREE_ADDRESSABLE (var) |= TREE_ADDRESSABLE (result);
+	  if (TREE_ADDRESSABLE (result))
+	    mark_addressable (var);
 	}
       if ((TREE_CODE (TREE_TYPE (result)) == COMPLEX_TYPE
            || TREE_CODE (TREE_TYPE (result)) == VECTOR_TYPE)