From fdb8f4189ccfe9ef56ffb438ee8d4e98902bbfdc Mon Sep 17 00:00:00 2001
From: Paolo Carlini <pcarlini@suse.de>
Date: Tue, 18 Sep 2007 18:05:40 +0000
Subject: [PATCH] re PR c++/33462 (Broken diagnostic: 'va_arg_expr' not
supported by dump_expr)
/cp
2007-09-18 Paolo Carlini <pcarlini@suse.de>
PR c++/33462
* cxx-pretty-print.c (pp_cxx_va_arg_expression): Add.
(pp_cxx_primary_expression): Use it.
* cxx-pretty-print.h (pp_cxx_va_arg_expression): Declare.
* error.c (dump_expr): Use it.
/testsuite
2007-09-18 Paolo Carlini <pcarlini@suse.de>
PR c++/33462
* g++.dg/ext/va-arg1.C: New.
From-SVN: r128584
---
gcc/cp/ChangeLog | 8 ++++++++
gcc/cp/cxx-pretty-print.c | 17 +++++++++++++++++
gcc/cp/cxx-pretty-print.h | 1 +
gcc/cp/error.c | 4 ++++
gcc/testsuite/ChangeLog | 5 +++++
gcc/testsuite/g++.dg/ext/va-arg1.C | 8 ++++++++
6 files changed, 43 insertions(+)
create mode 100644 gcc/testsuite/g++.dg/ext/va-arg1.C
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 504a0c36d285..6f9e04d48f45 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,11 @@
+2007-09-18 Paolo Carlini <pcarlini@suse.de>
+
+ PR c++/33462
+ * cxx-pretty-print.c (pp_cxx_va_arg_expression): Add.
+ (pp_cxx_primary_expression): Use it.
+ * cxx-pretty-print.h (pp_cxx_va_arg_expression): Declare.
+ * error.c (dump_expr): Use it.
+
2007-09-18 Paolo Carlini <pcarlini@suse.de>
PR c++/33463
diff --git a/gcc/cp/cxx-pretty-print.c b/gcc/cp/cxx-pretty-print.c
index a73a052572b9..b660f5347649 100644
--- a/gcc/cp/cxx-pretty-print.c
+++ b/gcc/cp/cxx-pretty-print.c
@@ -351,6 +351,8 @@ pp_cxx_id_expression (cxx_pretty_printer *pp, tree t)
id-expression
GNU Extensions:
+ __builtin_va_arg ( assignment-expression , type-id )
+
__has_nothrow_assign ( type-id )
__has_nothrow_constructor ( type-id )
__has_nothrow_copy ( type-id )
@@ -410,6 +412,10 @@ pp_cxx_primary_expression (cxx_pretty_printer *pp, tree t)
pp_cxx_trait_expression (pp, t);
break;
+ case VA_ARG_EXPR:
+ pp_cxx_va_arg_expression (pp, t);
+ break;
+
default:
pp_c_primary_expression (pp_c_base (pp), t);
break;
@@ -2152,6 +2158,17 @@ pp_cxx_typeid_expression (cxx_pretty_printer *pp, tree t)
pp_cxx_right_paren (pp);
}
+void
+pp_cxx_va_arg_expression (cxx_pretty_printer *pp, tree t)
+{
+ pp_cxx_identifier (pp, "__builtin_va_arg");
+ pp_cxx_left_paren (pp);
+ pp_cxx_assignment_expression (pp, TREE_OPERAND (t, 0));
+ pp_cxx_separate_with (pp, ',');
+ pp_cxx_type_id (pp, TREE_TYPE (t));
+ pp_cxx_right_paren (pp);
+}
+
void
pp_cxx_trait_expression (cxx_pretty_printer *pp, tree t)
{
diff --git a/gcc/cp/cxx-pretty-print.h b/gcc/cp/cxx-pretty-print.h
index f399feafaa4d..b65337644780 100644
--- a/gcc/cp/cxx-pretty-print.h
+++ b/gcc/cp/cxx-pretty-print.h
@@ -71,5 +71,6 @@ void pp_cxx_declaration (cxx_pretty_printer *, tree);
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);
#endif /* GCC_CXX_PRETTY_PRINT_H */
diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index 1854fd6888cf..602426a79a14 100644
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -2062,6 +2062,10 @@ dump_expr (tree t, int flags)
pp_cxx_typeid_expression (cxx_pp, t);
break;
+ case VA_ARG_EXPR:
+ pp_cxx_va_arg_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 4cf9eb53d557..24f18f47727e 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-18 Paolo Carlini <pcarlini@suse.de>
+
+ PR c++/33462
+ * g++.dg/ext/va-arg1.C: New.
+
2007-09-18 Tobias Burnus <burnus@net-b.de>
* gfortran.dg/elemental_optional_args_1.f90: Fix test.
diff --git a/gcc/testsuite/g++.dg/ext/va-arg1.C b/gcc/testsuite/g++.dg/ext/va-arg1.C
new file mode 100644
index 000000000000..5e76d45da129
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/va-arg1.C
@@ -0,0 +1,8 @@
+// PR c++/33462
+
+struct A {};
+
+void foo()
+{
+ ++__builtin_va_arg(0, A); // { dg-error "'\\+\\+__builtin_va_arg\\(0, A\\)'" }
+}
--
GitLab