procyberian/gcc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR c++/54026 (template const struct with mutable members erroneously emitted to .rodata)

Browse source 
PR c++/54026
	* typeck.c (cp_apply_type_quals_to_decl): Check COMPLETE_TYPE_P.

From-SVN: r189701
This commit is contained in:
Jason Merrill 2012-07-20 02:29:13 -04:00 • committed by Jason Merrill
parent c62c6622bc
commit 6d876e0b31
4 changed files with 31 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
gcc/cp/ChangeLog
View file

@ -1,5 +1,8 @@
2012-07-19 Jason Merrill <jason@redhat.com>
PR c++/54026
* typeck.c (cp_apply_type_quals_to_decl): Check COMPLETE_TYPE_P.
PR c++/54021
* call.c (build_cxx_call): Set optimize when folding
__builtin_constant_p in a constexpr function.

6
gcc/cp/typeck.c
View file

@ -8453,9 +8453,9 @@ cp_apply_type_quals_to_decl (int type_quals, tree decl)
constructor can produce constant init, so rely on cp_finish_decl to
clear TREE_READONLY if the variable has non-constant init. */
/* If the type has a mutable component, that component might be
modified. */
if (TYPE_HAS_MUTABLE_P (type))
/* If the type has (or might have) a mutable component, that component
might be modified. */
if (TYPE_HAS_MUTABLE_P (type) || !COMPLETE_TYPE_P (type))
type_quals &= ~TYPE_QUAL_CONST;
c_apply_type_quals_to_decl (type_quals, decl);

5
gcc/testsuite/ChangeLog
View file

@ -1,3 +1,8 @@
2012-07-19 Jason Merrill <jason@redhat.com>
PR c++/54026
* g++.dg/init/mutable1.C: New.
2012-07-20 Tobias Burnus <burnus@net-b.de>
PR fortran/48820

20
gcc/testsuite/g++.dg/init/mutable1.C Normal file
View file

@ -0,0 +1,20 @@
// PR c++/54026
// { dg-final { scan-assembler-not "rodata" } }
void non_const(int *);
template <typename T>
struct Foo {
T x;
mutable int y;
void func() const { non_const(&y); }
};
struct Bar {
int x;
mutable int y;
void func() const { non_const(&y); }
};
const Foo<int> foo = { 1, 2 };
const Bar bar = { 3, 4 };