From e7d61178099e49835d84fba9c5bffbace0f26099 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 16 Sep 2016 22:21:29 +0200 Subject: re PR c++/77375 (constant object with mutable subobject allocated in read-only memory) PR c++/77375 * class.c (check_bases): Set CLASSTYPE_HAS_MUTABLE if any TYPE_HAS_MUTABLE_P for any bases. * g++.dg/cpp0x/mutable1.C: New test. From-SVN: r240195 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/class.c | 2 ++ 2 files changed, 8 insertions(+) (limited to 'gcc/cp') diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 1b5140f..ee0818e 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2016-09-16 Jakub Jelinek + + PR c++/77375 + * class.c (check_bases): Set CLASSTYPE_HAS_MUTABLE if any + TYPE_HAS_MUTABLE_P for any bases. + 2016-09-16 Jason Merrill * class.c (check_bases, set_one_vmethod_tm_attributes): Use diff --git a/gcc/cp/class.c b/gcc/cp/class.c index 150f46f..7362c73 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -1796,6 +1796,8 @@ check_bases (tree t, SET_CLASSTYPE_REF_FIELDS_NEED_INIT (t, CLASSTYPE_REF_FIELDS_NEED_INIT (t) | CLASSTYPE_REF_FIELDS_NEED_INIT (basetype)); + if (TYPE_HAS_MUTABLE_P (basetype)) + CLASSTYPE_HAS_MUTABLE (t) = 1; /* A standard-layout class is a class that: ... -- cgit v1.1