aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2012-01-06 16:39:19 -0500
committerJason Merrill <jason@gcc.gnu.org>2012-01-06 16:39:19 -0500
commit11a36a2754b40efa9539178a30f2cfa2bda7e577 (patch)
tree124ea7e1ffb7823d9571367bcc8954c4c4b3aa6a /gcc
parent458961279a87b43f2bd98ec22cabd518a9580041 (diff)
downloadgcc-11a36a2754b40efa9539178a30f2cfa2bda7e577.zip
gcc-11a36a2754b40efa9539178a30f2cfa2bda7e577.tar.gz
gcc-11a36a2754b40efa9539178a30f2cfa2bda7e577.tar.bz2
* error.c (dump_expr): Print type of CONSTRUCTOR.
From-SVN: r182967
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog4
-rw-r--r--gcc/cp/error.c2
-rw-r--r--gcc/testsuite/ChangeLog4
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/error7.C10
4 files changed, 20 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index e6ea3bf..3f77f1b 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-06 Jason Merrill <jason@redhat.com>
+
+ * error.c (dump_expr): Print type of CONSTRUCTOR.
+
2012-01-05 Dodji Seketeli <dodji@redhat.com>
PR c++/51541
diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index 21d6781..62b47ca 100644
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -2194,6 +2194,8 @@ dump_expr (tree t, int flags)
}
else
{
+ if (!BRACE_ENCLOSED_INITIALIZER_P (t))
+ dump_type (TREE_TYPE (t), 0);
pp_cxx_left_brace (cxx_pp);
dump_expr_init_vec (CONSTRUCTOR_ELTS (t), flags);
pp_cxx_right_brace (cxx_pp);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index aeef955..3f46fed 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-06 Jason Merrill <jason@redhat.com>
+
+ * g++.dg/cpp0x/error7.C: New.
+
2012-01-06 Tobias Burnus <burnus@net-b.de>
* gfortran.dg/deallocate_stat_2.f90: New.
diff --git a/gcc/testsuite/g++.dg/cpp0x/error7.C b/gcc/testsuite/g++.dg/cpp0x/error7.C
new file mode 100644
index 0000000..0dfbf9f
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/error7.C
@@ -0,0 +1,10 @@
+// Test for printing the type of T{} in error messages.
+// { dg-options -std=c++0x }
+
+template <class T, T t> struct A { };
+template <class T> A<T,T{}> f(T t); // { dg-message "T{}" }
+
+int main()
+{
+ f(); // { dg-error "no match" }
+}