From c57863be4fad21a53cb7b8f05dfdf395f98d86d8 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Tue, 2 Apr 2013 12:25:00 +0000 Subject: [PATCH] re PR c++/56768 ([4.7] ICE in make_decl_rtl, at varasm.c:1147) 2013-04-02 Richard Biener PR middle-end/56768 Backport from mainline 2012-05-16 Richard Guenther * tree-inline.c (declare_return_variable): Properly handle DECL_BY_REFERENCE return vars in SSA form. * g++.dg/torture/pr56768.C: New testcase. From-SVN: r197351 --- gcc/ChangeLog | 9 ++++++ gcc/testsuite/ChangeLog | 5 ++++ gcc/testsuite/g++.dg/torture/pr56768.C | 41 ++++++++++++++++++++++++++ gcc/tree-inline.c | 13 +++++--- 4 files changed, 64 insertions(+), 4 deletions(-) create mode 100644 gcc/testsuite/g++.dg/torture/pr56768.C diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2249e50f2c9c..25743df9f2bd 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2013-04-02 Richard Biener + + PR middle-end/56768 + Backport from mainline + 2012-05-16 Richard Guenther + + * tree-inline.c (declare_return_variable): Properly handle + DECL_BY_REFERENCE return vars in SSA form. + 2013-04-01 Wei Mi * config/i386/i386.md (*ashl3_mask): Rewrite as define_insn. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index d608dd7fcd43..bb5eae306082 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2013-04-02 Richard Biener + + PR middle-end/56768 + * g++.dg/torture/pr56768.C: New testcase. + 2013-04-01 Andrey Belevantsev 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 index 000000000000..db504c500e0f --- /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 5854bd934aba..b869364c13d0 100644 --- 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 -- 2.47.2