OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR c++/58511 ([c++11] ICE using static const member variable in constexpr)

Browse Source 
PR c++/58511
	* semantics.c (is_instantiation_of_constexpr): Return true for
	defaulted functions, too.
	(explain_invalid_constexpr_fn): Only use
	explain_implicit_non_constexpr if !DECL_DECLARED_CONSTEXPR_P.
	* method.c (explain_implicit_non_constexpr): Pass
	DECL_INHERITED_CTOR_BASE to explain_implicit_non_constexpr.

From-SVN: r212507
This commit is contained in:
Jason Merrill 2014-07-14 01:25:37 -04:00 committed by Jason Merrill
parent 1ea3b9879b
commit e89ff446df
5 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/cp/ChangeLog
View File

@ -1,5 +1,13 @@
2014-07-13 Jason Merrill <jason@redhat.com>
PR c++/58511
* semantics.c (is_instantiation_of_constexpr): Return true for
defaulted functions, too.
(explain_invalid_constexpr_fn): Only use
explain_implicit_non_constexpr if !DECL_DECLARED_CONSTEXPR_P.
* method.c (explain_implicit_non_constexpr): Pass
DECL_INHERITED_CTOR_BASE to explain_implicit_non_constexpr.
PR c++/58611
* decl.c (check_initializer): Don't finish_compound_literal
on erroneous constexpr init.

3
gcc/cp/method.c
View File

@ -1575,7 +1575,8 @@ explain_implicit_non_constexpr (tree decl)
synthesized_method_walk (DECL_CLASS_CONTEXT (decl),
special_function_p (decl), const_p,
NULL, NULL, NULL, &dummy, true,
NULL_TREE, NULL_TREE);
DECL_INHERITED_CTOR_BASE (decl),
FUNCTION_FIRST_USER_PARMTYPE (decl));
}
/* DECL is an instantiation of an inheriting constructor template. Deduce

11
gcc/cp/semantics.c
View File

@ -3949,13 +3949,16 @@ emit_associated_thunks (tree fn)
}
/* Returns true iff FUN is an instantiation of a constexpr function
template. */
template or a defaulted constexpr function. */
static inline bool
is_instantiation_of_constexpr (tree fun)
{
return (DECL_TEMPLOID_INSTANTIATION (fun)
&& DECL_DECLARED_CONSTEXPR_P (DECL_TI_TEMPLATE (fun)));
return ((DECL_TEMPLOID_INSTANTIATION (fun)
&& DECL_DECLARED_CONSTEXPR_P (DECL_TI_TEMPLATE (fun)))
|| (DECL_DEFAULTED_FN (fun)
&& DECL_DECLARED_CONSTEXPR_P (fun)));
}
/* Generate RTL for FN. */
@ -8048,7 +8051,7 @@ explain_invalid_constexpr_fn (tree fun)
if (is_valid_constexpr_fn (fun, true))
{
/* Then if it's OK, the body. */
if (DECL_DEFAULTED_FN (fun))
if (!DECL_DECLARED_CONSTEXPR_P (fun))
explain_implicit_non_constexpr (fun);
else
{

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

@ -0,0 +1,15 @@
// PR c++/58511
// { dg-do compile { target c++11 } }
struct A
{
constexpr A(int, int = i) {}
static const int i;
};
struct B : A
{
using A::A; // { dg-error "A::i" }
};
constexpr B b(0); // { dg-error "B::B" }

4
gcc/testsuite/g++.dg/cpp0x/nsdmi3.C
View File

@ -10,9 +10,9 @@ struct B
{
A a1 = 1; // { dg-error "" }
A a2 { 2 };
A a3 = { 3 }; // { dg-error "" }
A a3 = { 3 }; // { dg-error "explicit" }
};
constexpr B b; // { dg-error "B::B" }
// { dg-message "a1. is invalid" "" { target *-*-* } 11 }
// { dg-prune-output "uninitialized member" }