mirror/gcc
1
0
Fork 0
mirror of https://github.com/gcc-mirror/gcc.git synced 2024-11-21 13:40:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

re PR c++/55753 ([C++11][4.7/4.8 Regression] ICE constexpr ctor, tsubst_copy_and_build, at cp/pt.c:14336)

Browse Source 
PR c++/55753
	* tree.c (build_aggr_init_expr): Do nothing in a template.
	* pt.c (tsubst_copy_and_build) [CALL_EXPR]: Strip an ADDR_EXPR off
	a FUNCTION_DECL before tsubsting.

From-SVN: r194986
This commit is contained in:
Jason Merrill 2013-01-07 13:00:18 -05:00 committed by Jason Merrill
parent 656e6f3761
commit e4d7d8cb69
4 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/cp/ChangeLog
View File

@ -1,3 +1,10 @@
2013-01-07 Jason Merrill <jason@redhat.com>
PR c++/55753
* tree.c (build_aggr_init_expr): Do nothing in a template.
* pt.c (tsubst_copy_and_build) [CALL_EXPR]: Strip an ADDR_EXPR off
a FUNCTION_DECL before tsubsting.
2013-01-04 Dodji Seketeli <dodji@redhat.com>
PR c++/52343

5
gcc/cp/pt.c
View File

@ -13743,6 +13743,11 @@ tsubst_copy_and_build (tree t,
else
qualified_p = false;
if (TREE_CODE (function) == ADDR_EXPR
&& TREE_CODE (TREE_OPERAND (function, 0)) == FUNCTION_DECL)
/* Avoid error about taking the address of a constructor. */
function = TREE_OPERAND (function, 0);
function = tsubst_copy_and_build (function, args, complain,
in_decl,
!qualified_p,

4
gcc/cp/tree.c
View File

@ -412,6 +412,10 @@ build_aggr_init_expr (tree type, tree init)
tree rval;
int is_ctor;
/* Don't build AGGR_INIT_EXPR in a template. */
if (processing_template_decl)
return init;
if (TREE_CODE (init) == CALL_EXPR)
fn = CALL_EXPR_FN (init);
else if (TREE_CODE (init) == AGGR_INIT_EXPR)

15
gcc/testsuite/g++.dg/cpp0x/constexpr-ctor13.C Normal file
View File

@ -0,0 +1,15 @@
// PR c++/55753
// { dg-options -std=c++11 }
struct A
{
double r,i;
constexpr A(double r = 0.0, double i = 0.0): r(r), i(i) {}
};
template <typename Tp>
struct B {
B() {
A((true ? 1.0 : A()));
}
};