diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 8165176ae5ede5cc0420d90d07b3991b7a7eec43..61c614ff6ee46f6546d228e97bcc4a6632f63cde 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-12  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/30854
+	* error.c (dump_expr) <case AGGR_INIT_EXPR>: Pass true as last
+	argument to dump_aggr_init_expr_args instead of false.
+
 2007-07-11  Douglas Gregor  <doug.gregor@gmail.com>
 
 	* typeck.c (comptypes): When USE_CANONICAL_TYPES, use the
diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index 512944b5ce59b3f8d2dec8db548d239d7c844b6a..7e4828ca3bbbe81bdb119cbed60ca852379a93fe 100644
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -1520,7 +1520,7 @@ dump_expr (tree t, int flags)
 	else
 	  dump_expr (AGGR_INIT_EXPR_FN (t), 0);
       }
-      dump_aggr_init_expr_args (t, flags, false);
+      dump_aggr_init_expr_args (t, flags, true);
       break;
 
     case CALL_EXPR:
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9f4a390bc382046f1394f3c23a78a2fa3a7ad1d1..22fc219cda3813f4840670272ff041d7e33bbea1 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-12  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/30854
+	* g++.dg/parse/error30.C: New test.
+
 2007-07-12  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
 
 	PR fortran/29804
diff --git a/gcc/testsuite/g++.dg/parse/error30.C b/gcc/testsuite/g++.dg/parse/error30.C
new file mode 100644
index 0000000000000000000000000000000000000000..734a2552cb4296367005f702a6422b6c3d450523
--- /dev/null
+++ b/gcc/testsuite/g++.dg/parse/error30.C
@@ -0,0 +1,11 @@
+// PR c++/30854
+// { dg-do compile }
+
+struct A
+{
+  A();
+  A(int);
+};
+
+A a = -A();	// { dg-error "no match for.*operator-.*in.*-A\\(\\)" }
+A b = -A(5);	// { dg-error "no match for.*operator-.*in.*-A\\(5\\)" }