summaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
authormpolacek <mpolacek@138bc75d-0d04-0410-961f-82ee72b054a4>2015-04-01 13:08:05 +0000
committermpolacek <mpolacek@138bc75d-0d04-0410-961f-82ee72b054a4>2015-04-01 13:08:05 +0000
commitabab7c700188c03510cb9776b15007432816355b (patch)
tree957638af48e07034a160a9355bff94fde6b7c11d /gcc/cp
parent7fc3fdaf30015bfb654cd2933ae351e1b0553771 (diff)
downloadgcc-abab7c700188c03510cb9776b15007432816355b.tar.gz
PR c++/65554
* class.c (finish_struct): Require that the second field of a user-defined initializer_list be of size type. * g++.dg/cpp0x/initlist93.C: New test. * g++.dg/cpp0x/initlist94.C: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@221808 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/class.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 0d2456d6eb8..946450b48b0 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2015-04-01 Marek Polacek <polacek@redhat.com>
+
+ PR c++/65554
+ * class.c (finish_struct): Require that the second field of a
+ user-defined initializer_list be of size type.
+
2015-03-31 Marek Polacek <polacek@redhat.com>
PR c++/65390
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index c2d420190c4..9f189fb5eaf 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -6891,7 +6891,7 @@ finish_struct (tree t, tree attributes)
if (f && TREE_CODE (TREE_TYPE (f)) == POINTER_TYPE)
{
f = next_initializable_field (DECL_CHAIN (f));
- if (f && TREE_CODE (TREE_TYPE (f)) == INTEGER_TYPE)
+ if (f && same_type_p (TREE_TYPE (f), size_type_node))
ok = true;
}
}