summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>2012-01-06 21:39:19 +0000
committerjason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>2012-01-06 21:39:19 +0000
commit81d8c61fe28486f653f93cec2fdedb1216d19eda (patch)
tree124ea7e1ffb7823d9571367bcc8954c4c4b3aa6a
parent11ec81bdd2f7b5f06ff90d0e31770fe61820027c (diff)
downloadppe42-gcc-81d8c61fe28486f653f93cec2fdedb1216d19eda.tar.gz
ppe42-gcc-81d8c61fe28486f653f93cec2fdedb1216d19eda.zip
* error.c (dump_expr): Print type of CONSTRUCTOR.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@182967 138bc75d-0d04-0410-961f-82ee72b054a4
-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 e6ea3bf119b..3f77f1b15c8 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 21d6781567e..62b47ca2a36 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 aeef955360f..3f46fede082 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 00000000000..0dfbf9f0406
--- /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" }
+}
OpenPOWER on IntegriCloud