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

re PR c++/81942 (ICE on empty constexpr constructor with C++14)

Browse Source 
/cp
2017-09-05  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/81942
	* cp-tree.h (LABEL_DECL_CDTOR): Add and document.
	* decl.c (start_preparsed_function): Set LABEL_DECL_CDTOR when
	creating cdtor_label.
	* constexpr.c (returns): Add the case of a constructor/destructor
	returning via a LABEL_DECL_CDTOR label.
	(cxx_eval_constant_expression, case [GOTO_EXPR]): Likewise.

/testsuite
2017-09-05  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/81942
	* g++.dg/cpp1y/constexpr-return3.C: New.

From-SVN: r251714
This commit is contained in:
Paolo Carlini 2017-09-05 13:33:44 +00:00 committed by Paolo Carlini
parent ae85ad3a95
commit d49318d9bc
6 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gcc/cp/ChangeLog
View File

@ -1,3 +1,13 @@
2017-09-05 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/81942
* cp-tree.h (LABEL_DECL_CDTOR): Add and document.
* decl.c (start_preparsed_function): Set LABEL_DECL_CDTOR when
creating cdtor_label.
* constexpr.c (returns): Add the case of a constructor/destructor
returning via a LABEL_DECL_CDTOR label.
(cxx_eval_constant_expression, case [GOTO_EXPR]): Likewise.
2017-09-01 Nathan Sidwell <nathan@acm.org> 2017-09-01 Nathan Sidwell <nathan@acm.org>
* cp-tree.h (resort_type_method_vec): Move declaration to ... * cp-tree.h (resort_type_method_vec): Move declaration to ...

8
gcc/cp/constexpr.c
View File

@ -3671,7 +3671,9 @@ static bool
returns (tree *jump_target) returns (tree *jump_target)
{ {
return *jump_target return *jump_target
&& TREE_CODE (*jump_target) == RETURN_EXPR; && (TREE_CODE (*jump_target) == RETURN_EXPR
|| (TREE_CODE (*jump_target) == LABEL_DECL
&& LABEL_DECL_CDTOR (*jump_target)));
} }
static bool static bool
@ -4554,7 +4556,9 @@ cxx_eval_constant_expression (const constexpr_ctx *ctx, tree t,
case GOTO_EXPR: case GOTO_EXPR:
*jump_target = TREE_OPERAND (t, 0); *jump_target = TREE_OPERAND (t, 0);
gcc_assert (breaks (jump_target) || continues (jump_target)); gcc_assert (breaks (jump_target) || continues (jump_target)
/* Allow for jumping to a cdtor_label. */
|| returns (jump_target));
break; break;
case LOOP_EXPR: case LOOP_EXPR:

6
gcc/cp/cp-tree.h
View File

@ -456,6 +456,7 @@ extern GTY(()) tree cp_global_trees[CPTI_MAX];
DECL_CONSTRAINT_VAR_P (in a PARM_DECL) DECL_CONSTRAINT_VAR_P (in a PARM_DECL)
TEMPLATE_DECL_COMPLEX_ALIAS_P (in TEMPLATE_DECL) TEMPLATE_DECL_COMPLEX_ALIAS_P (in TEMPLATE_DECL)
DECL_INSTANTIATING_NSDMI_P (in a FIELD_DECL) DECL_INSTANTIATING_NSDMI_P (in a FIELD_DECL)
LABEL_DECL_CDTOR (in LABEL_DECL)
3: DECL_IN_AGGR_P. 3: DECL_IN_AGGR_P.
4: DECL_C_BIT_FIELD (in a FIELD_DECL) 4: DECL_C_BIT_FIELD (in a FIELD_DECL)
DECL_ANON_UNION_VAR_P (in a VAR_DECL) DECL_ANON_UNION_VAR_P (in a VAR_DECL)
@ -3833,6 +3834,11 @@ more_aggr_init_expr_args_p (const aggr_init_expr_arg_iterator *iter)
#define LABEL_DECL_CONTINUE(NODE) \ #define LABEL_DECL_CONTINUE(NODE) \
DECL_LANG_FLAG_1 (LABEL_DECL_CHECK (NODE)) DECL_LANG_FLAG_1 (LABEL_DECL_CHECK (NODE))
/* Nonzero if NODE is the target for genericization of 'return' stmts
in constructors/destructors of targetm.cxx.cdtor_returns_this targets. */
#define LABEL_DECL_CDTOR(NODE) \
DECL_LANG_FLAG_2 (LABEL_DECL_CHECK (NODE))
/* True if NODE was declared with auto in its return type, but it has /* True if NODE was declared with auto in its return type, but it has
started compilation and so the return type might have been changed by started compilation and so the return type might have been changed by
return type deduction; its declared return type should be found in return type deduction; its declared return type should be found in

5
gcc/cp/decl.c
View File

@ -15072,7 +15072,10 @@ start_preparsed_function (tree decl1, tree attrs, int flags)
if (DECL_DESTRUCTOR_P (decl1) if (DECL_DESTRUCTOR_P (decl1)
|| (DECL_CONSTRUCTOR_P (decl1) || (DECL_CONSTRUCTOR_P (decl1)
&& targetm.cxx.cdtor_returns_this ())) && targetm.cxx.cdtor_returns_this ()))
cdtor_label = create_artificial_label (input_location); {
cdtor_label = create_artificial_label (input_location);
LABEL_DECL_CDTOR (cdtor_label) = true;
}
start_fname_decls (); start_fname_decls ();

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2017-09-05 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/81942
* g++.dg/cpp1y/constexpr-return3.C: New.
2017-09-05 Eric Botcazou <ebotcazou@adacore.com> 2017-09-05 Eric Botcazou <ebotcazou@adacore.com>
* gnat.dg/incomplete5.ad[sb]: New test. * gnat.dg/incomplete5.ad[sb]: New test.

11
gcc/testsuite/g++.dg/cpp1y/constexpr-return3.C Normal file
View File

@ -0,0 +1,11 @@
// PR c++/81942
// { dg-do compile { target c++14 } }
class A {
public:
constexpr A() {
return;
}
};
A mwi;