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

re PR c++/67364 ("accessing uninitialized member" error in constexpr context)

Browse Source 
PR c++/67364

	* constexpr.c (cxx_eval_component_reference): Further tweak.

From-SVN: r233982
This commit is contained in:
Jason Merrill 2016-03-04 17:08:22 -05:00 committed by Jason Merrill
parent 39dce2b790
commit 188e53bd7e
3 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gcc/cp/ChangeLog
View File

@ -1,5 +1,8 @@
2016-03-04 Jason Merrill <jason@redhat.com> 2016-03-04 Jason Merrill <jason@redhat.com>
PR c++/67364
* constexpr.c (cxx_eval_component_reference): Further tweak.
* constexpr.c (struct constexpr_ctx): Add save_exprs field. * constexpr.c (struct constexpr_ctx): Add save_exprs field.
(cxx_eval_loop_expr): Discard SAVE_EXPR values before looping. (cxx_eval_loop_expr): Discard SAVE_EXPR values before looping.
(cxx_eval_constant_expression) [SAVE_EXPR]: Add it to the set. (cxx_eval_constant_expression) [SAVE_EXPR]: Add it to the set.

11
gcc/cp/constexpr.c
View File

@ -1990,13 +1990,16 @@ cxx_eval_component_reference (const constexpr_ctx *ctx, tree t,
return t; return t;
} }
if (CONSTRUCTOR_NO_IMPLICIT_ZERO (whole) /* We only create a CONSTRUCTOR for a subobject when we modify it, so empty
&& !is_really_empty_class (TREE_TYPE (t))) classes never get represented; throw together a value now. */
if (is_really_empty_class (TREE_TYPE (t)))
return build_constructor (TREE_TYPE (t), NULL);
if (CONSTRUCTOR_NO_IMPLICIT_ZERO (whole))
{ {
/* 'whole' is part of the aggregate initializer we're currently /* 'whole' is part of the aggregate initializer we're currently
building; if there's no initializer for this member yet, that's an building; if there's no initializer for this member yet, that's an
error. But expand_aggr_init_1 doesn't bother to initialize really error. */
empty classes, so ignore them here, too. */
if (!ctx->quiet) if (!ctx->quiet)
error ("accessing uninitialized member %qD", part); error ("accessing uninitialized member %qD", part);
*non_constant_p = true; *non_constant_p = true;

27
gcc/testsuite/g++.dg/cpp1y/constexpr-empty2.C Normal file
View File

@ -0,0 +1,27 @@
// { dg-do compile { target c++14 } }
struct A
{
constexpr A(int) { }
};
struct B: A {
constexpr B(int i): A(i) { }
constexpr B(const B& b): A(b) { }
};
struct C {
B b;
constexpr C(int i): b(i) { }
constexpr C(const C&c): b(c.b) {}
};
constexpr int f()
{
C b1{42};
C b2{b1};
b2.b;
return 42;
}
constexpr int i = f();