From 6208170481d560900fd19e3b393c746fd8c0a6e2 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Thu, 27 Sep 2007 09:20:59 +0000 Subject: [PATCH] re PR c++/33493 (Broken diagnostic: 'dl_expr' not supported by dump_expr) /cp 2007-09-27 Paolo Carlini PR c++/33493 * error.c (dump_expr): Deal with DELETE_EXPR and VEC_DELETE_EXPR. * cxx-pretty-print.c (pp_cxx_delete_expression): Add missing spaces in the formatting. * cxx-pretty-print.h (pp_cxx_delete_expression): Declare. /testsuite 2007-09-27 Paolo Carlini PR c++/33493 * g++.dg/template/error31.C: New. From-SVN: r128831 --- gcc/cp/ChangeLog | 8 ++++++++ gcc/cp/cxx-pretty-print.c | 7 +++++-- gcc/cp/cxx-pretty-print.h | 1 + gcc/cp/error.c | 5 +++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/template/error31.C | 3 +++ 6 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/g++.dg/template/error31.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 915ac9ed986..f459c54ae59 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,11 @@ +2007-09-27 Paolo Carlini + + PR c++/33493 + * error.c (dump_expr): Deal with DELETE_EXPR and VEC_DELETE_EXPR. + * cxx-pretty-print.c (pp_cxx_delete_expression): Add missing + spaces in the formatting. + * cxx-pretty-print.h (pp_cxx_delete_expression): Declare. + 2007-09-27 Jakub Jelinek * error.c (cxx_print_error_function): Add third argument, pass diff --git a/gcc/cp/cxx-pretty-print.c b/gcc/cp/cxx-pretty-print.c index 9a27ae81a18..6481273fd86 100644 --- a/gcc/cp/cxx-pretty-print.c +++ b/gcc/cp/cxx-pretty-print.c @@ -662,7 +662,7 @@ pp_cxx_new_expression (cxx_pretty_printer *pp, tree t) ::(opt) delete cast-expression ::(opt) delete [ ] cast-expression */ -static void +void pp_cxx_delete_expression (cxx_pretty_printer *pp, tree t) { enum tree_code code = TREE_CODE (t); @@ -673,10 +673,13 @@ pp_cxx_delete_expression (cxx_pretty_printer *pp, tree t) if (DELETE_EXPR_USE_GLOBAL (t)) pp_cxx_colon_colon (pp); pp_cxx_identifier (pp, "delete"); - if (code == VEC_DELETE_EXPR) + pp_space (pp); + if (code == VEC_DELETE_EXPR + || DELETE_EXPR_USE_VEC (t)) { pp_left_bracket (pp); pp_right_bracket (pp); + pp_space (pp); } pp_c_cast_expression (pp_c_base (pp), TREE_OPERAND (t, 0)); break; diff --git a/gcc/cp/cxx-pretty-print.h b/gcc/cp/cxx-pretty-print.h index b6533764478..66943ac0246 100644 --- a/gcc/cp/cxx-pretty-print.h +++ b/gcc/cp/cxx-pretty-print.h @@ -72,5 +72,6 @@ void pp_cxx_canonical_template_parameter (cxx_pretty_printer *, tree); void pp_cxx_trait_expression (cxx_pretty_printer *, tree); void pp_cxx_typeid_expression (cxx_pretty_printer *, tree); void pp_cxx_va_arg_expression (cxx_pretty_printer *, tree); +void pp_cxx_delete_expression (cxx_pretty_printer *, tree); #endif /* GCC_CXX_PRETTY_PRINT_H */ diff --git a/gcc/cp/error.c b/gcc/cp/error.c index 24f1d83a0c1..4337d4d2630 100644 --- a/gcc/cp/error.c +++ b/gcc/cp/error.c @@ -2066,6 +2066,11 @@ dump_expr (tree t, int flags) pp_cxx_va_arg_expression (cxx_pp, t); break; + case DELETE_EXPR: + case VEC_DELETE_EXPR: + pp_cxx_delete_expression (cxx_pp, t); + break; + /* This list is incomplete, but should suffice for now. It is very important that `sorry' does not call `report_error_function'. That could cause an infinite loop. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ec014ea8cc8..c74f8999854 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2007-09-27 Paolo Carlini + + PR c++/33493 + * g++.dg/template/error31.C: New. + 2007-09-27 Jakub Jelinek * lib/prune.exp: Prune also "^In function .*$" lines and diff --git a/gcc/testsuite/g++.dg/template/error31.C b/gcc/testsuite/g++.dg/template/error31.C new file mode 100644 index 00000000000..4fd70262389 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/error31.C @@ -0,0 +1,3 @@ +// PR c++/33493 + +template void foo() { delete 0 ? 1 : 0; } // { dg-error "delete 0" } -- 2.30.2