diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index fe4696bf205..ac8e3115539 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2011-12-05  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/51414
+	* semantics.c (finish_underlying_type): Use %qT, not %qE for the
+	error message.
+
 2011-12-05  Jason Merrill  <jason@redhat.com>
 
 	* init.c (expand_default_init): Unshare args in ctor delegation.
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 3c9853a3529..cca601d3973 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -3401,7 +3401,7 @@ finish_underlying_type (tree type)
 
   if (TREE_CODE (type) != ENUMERAL_TYPE)
     {
-      error ("%qE is not an enumeration type", type);
+      error ("%qT is not an enumeration type", type);
       return error_mark_node;
     }
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index fac85fe3323..1886e248edf 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-05  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/51414
+	* g++.dg/ext/underlying_type11.C: New.
+
 2011-12-05  Uros Bizjak  <ubizjak@gmail.com>
 
 	PR testsuite/51128
diff --git a/gcc/testsuite/g++.dg/ext/underlying_type11.C b/gcc/testsuite/g++.dg/ext/underlying_type11.C
new file mode 100644
index 00000000000..72ee434bba4
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/underlying_type11.C
@@ -0,0 +1,3 @@
+// PR c++/51414
+
+__underlying_type(int[1]) i; // { dg-error "int \\\[1\\\]|invalid" }