From 24b3d864a8d14aff75561b1bee142e10ddcc725c Mon Sep 17 00:00:00 2001 From: jakub Date: Fri, 16 Sep 2016 20:21:29 +0000 Subject: [PATCH] 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@240195 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/class.c | 2 ++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/cpp0x/mutable1.C | 12 ++++++++++++ 4 files changed, 25 insertions(+) create mode 100644 gcc/testsuite/g++.dg/cpp0x/mutable1.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 1b5140fe3d0..ee0818e2edf 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 150f46f6e19..7362c732646 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: ... diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 3c992548d11..bd3f70f0d5f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-09-16 Jakub Jelinek + + PR c++/77375 + * g++.dg/cpp0x/mutable1.C: New test. + 2016-09-16 Steven G. Kargl PR fortran/77612 diff --git a/gcc/testsuite/g++.dg/cpp0x/mutable1.C b/gcc/testsuite/g++.dg/cpp0x/mutable1.C new file mode 100644 index 00000000000..4dd37185d72 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/mutable1.C @@ -0,0 +1,12 @@ +// PR c++/77375 +// { dg-do run { target c++11 } } + +struct Base { mutable int i; }; +struct Derived : Base {}; +const Derived foo{}; + +int +main () +{ + foo.i = 42; +} -- 2.11.4.GIT