-
- Downloads
re PR c++/26266 (Trouble with static const data members in template classes)
PR c++/26266 * cp-tree.h (cp_finish_decl): Adjust declaration. (grokbitfield): Likewise. (finish_static_data_member_decl): Likewise. * init.c (constant_value_1): Ensure processing_template_decl when folding non-dependent initializers for static data members of dependent types. Return error_mark_node for erroneous initailizers. * class.c (get_vtable_decl): Use finish_decl, not cp_finish_decl. * decl.c (cp_make_fname_decl): Adjust call to cp_finish_decl. (cp_finish_decl): Add init_const_expr_p parameter. Set DECL_INITIALIZED_BY_CONSTANT_EXPRESSION_P here. (finish_decl): Adjust call to cp_finish_decl. (compute_array_index_type): Robustify. (start_method): Use finish_decl, not cp_finish_decl. * rtti.c (emit_tinfo_decl): Likewise. * except.c (initialize_handler_parm): Adjust call to cp_finish_decl. (expand_start_catch_block): Likewise. * cvt.c (build_up_reference): Adjust call to cp_finish_decl. * pt.c (instantiate_class_template): Adjust call to finish_static_data_member_decl. (tsubst_expr): Use finish_decl, not cp_finish_decl. (instantiate_decl): Adjust call to cp_finish_decl. * name-lookup.c (pushdecl_top_level_1): Use finish_decl, not cp_finish_decl. * decl2.c (finish_static_data_member_decl): Add init_const_expr_p parameter. (grokfield): Likewise. * parser.c (cp_parser_condition): Check for constant initializers. (cp_parser_init_declarator): Adjust calls to grokfield and cp_finish_decl. Don't set DECL_INITIALIZED_BY_CONSTANT_EXPRESSION_P here. (cp_parser_member_declaration): Likewise. (cp_parser_objc_class_ivars): Likewise. PR c++/26266 * g++.dg/template/static22.C: New test. * g++.dg/template/static23.C: New test. * g++.dg/template/static24.C: New test. * g++.dg/template/non-dependent13.C: New test. From-SVN: r111229
Showing
- gcc/cp/ChangeLog 38 additions, 0 deletionsgcc/cp/ChangeLog
- gcc/cp/class.c 1 addition, 1 deletiongcc/cp/class.c
- gcc/cp/cp-tree.h 3 additions, 3 deletionsgcc/cp/cp-tree.h
- gcc/cp/cvt.c 1 addition, 1 deletiongcc/cp/cvt.c
- gcc/cp/decl.c 33 additions, 10 deletionsgcc/cp/decl.c
- gcc/cp/decl2.c 17 additions, 28 deletionsgcc/cp/decl2.c
- gcc/cp/except.c 3 additions, 2 deletionsgcc/cp/except.c
- gcc/cp/init.c 9 additions, 3 deletionsgcc/cp/init.c
- gcc/cp/name-lookup.c 1 addition, 1 deletiongcc/cp/name-lookup.c
- gcc/cp/parser.c 18 additions, 22 deletionsgcc/cp/parser.c
- gcc/cp/pt.c 5 additions, 3 deletionsgcc/cp/pt.c
- gcc/cp/rtti.c 1 addition, 1 deletiongcc/cp/rtti.c
- gcc/testsuite/ChangeLog 8 additions, 0 deletionsgcc/testsuite/ChangeLog
- gcc/testsuite/g++.dg/template/non-dependent13.C 11 additions, 0 deletionsgcc/testsuite/g++.dg/template/non-dependent13.C
- gcc/testsuite/g++.dg/template/static22.C 11 additions, 0 deletionsgcc/testsuite/g++.dg/template/static22.C
- gcc/testsuite/g++.dg/template/static23.C 15 additions, 0 deletionsgcc/testsuite/g++.dg/template/static23.C
- gcc/testsuite/g++.dg/template/static24.C 15 additions, 0 deletionsgcc/testsuite/g++.dg/template/static24.C
Loading
Please register or sign in to comment