2013-04-02 Richard Biener <rguenther@suse.de>

	PR middle-end/56768
	Backport from mainline
	2012-05-16  Richard Guenther  <rguenther@suse.de>

	* tree-inline.c (declare_return_variable): Properly handle
	DECL_BY_REFERENCE return vars in SSA form.

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

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch@197351 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2249e50f2c9c4a6ddf73b6b95f59f1d3f7364e9b..25743df9f2bdd99dce4893b5f1d45f490ba74f96 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2013-04-02  Richard Biener  <rguenther@suse.de>
+
+       PR middle-end/56768
+       Backport from mainline
+       2012-05-16  Richard Guenther  <rguenther@suse.de>
+
+       * tree-inline.c (declare_return_variable): Properly handle
+       DECL_BY_REFERENCE return vars in SSA form.
+
 2013-04-01  Wei Mi  <wmi@google.com>
 
        * config/i386/i386.md (*ashl<mode>3_mask): Rewrite as define_insn.

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d608dd7fcd43f945d2ffc2e0f2d3cb47150bd583..bb5eae306082960ca141a3e6fe5767b98e63165d 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-02  Richard Biener  <rguenther@suse.de>
+
+       PR middle-end/56768
+       * g++.dg/torture/pr56768.C: New testcase.
+
 2013-04-01  Andrey Belevantsev  <abel@ispras.ru>
 
        Backport from mainline

diff --git a/gcc/testsuite/g++.dg/torture/pr56768.C b/gcc/testsuite/g++.dg/torture/pr56768.C
new file mode 100644 (file)
index 0000000..db504c5
--- /dev/null
+++ b/gcc/testsuite/g++.dg/torture/pr56768.C
@@ -0,0 +1,41 @@
+// { dg-do compile }
+// { dg-options "-std=c++0x" }
+
+struct Iter
+{
+  int& operator* ();
+  void operator++ ();
+};
+
+bool operator!= (Iter &, Iter &) { }
+
+struct Container
+{
+  Iter begin () const;
+  Iter end () const;
+};
+
+struct J
+{
+  virtual J *mutable_child ();
+};
+
+struct M
+{
+  M (const Container &);
+  J ns_;
+};
+namespace
+{
+  J MakeNamespace (const Container &src)
+    {
+      J a;
+      J *b = 0;
+      for (const int &c: src)
+       b = b ? b->mutable_child () : &a;
+      return a;
+    }
+}
+M::M (const Container &ns):ns_ (MakeNamespace (ns))
+{
+}

diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c
index 5854bd934aba7c24216c59806356a047803e4c83..b869364c13d0079a487f75f4d11e94a7f06a143c 100644 (file)
--- a/gcc/tree-inline.c
+++ b/gcc/tree-inline.c
@@ -2983,10 +2983,15 @@ declare_return_variable (copy_body_data *id, tree return_slot, tree modify_dest,
       if (gimple_in_ssa_p (id->src_cfun))
        add_referenced_var (temp);
       insert_decl_map (id, result, temp);
-      /* When RESULT_DECL is in SSA form, we need to use it's default_def
-        SSA_NAME.  */
-      if (gimple_in_ssa_p (id->src_cfun) && gimple_default_def (id->src_cfun, result))
-        temp = remap_ssa_name (gimple_default_def (id->src_cfun, result), id);
+      /* When RESULT_DECL is in SSA form, we need to remap and initialize
+        it's default_def SSA_NAME.  */
+      if (gimple_in_ssa_p (id->src_cfun)
+         && is_gimple_reg (result))
+       {
+         temp = make_ssa_name (temp, NULL);
+         insert_decl_map (id, gimple_default_def (id->src_cfun, result),
+                          temp);
+       }
       insert_init_stmt (id, entry_bb, gimple_build_assign (temp, var));
     }
   else