OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR c++/69688 (-Wsign-compare causes bogus error: size of array ‘uc_code’ is not an integral constant-expression) 

PR c++/69688
	* constexpr.c (clear_cv_and_fold_caches): Renamed from clear_cv_cache.
	Call clear_fold_cache.
	* cp-tree.h: Adjust declaration.
	* decl.c (finish_enum_value_list): Call clear_cv_and_fold_caches
	rather than clear_cv_cache and clear_fold_cache.
	* typeck2.c (store_init_value): Call clear_cv_and_fold_caches.

	* g++.dg/init/const12.C: New test.

From-SVN: r233220
This commit is contained in:
Marek Polacek 2016-02-08 15:40:33 +00:00 committed by Marek Polacek
parent 2158532f31
commit eba9e839de
7 changed files with 43 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gcc/cp/ChangeLog
View File

@ -1,3 +1,13 @@
2016-02-08 Marek Polacek <polacek@redhat.com>
PR c++/69688
* constexpr.c (clear_cv_and_fold_caches): Renamed from clear_cv_cache.
Call clear_fold_cache.
* cp-tree.h: Adjust declaration.
* decl.c (finish_enum_value_list): Call clear_cv_and_fold_caches
rather than clear_cv_cache and clear_fold_cache.
* typeck2.c (store_init_value): Call clear_cv_and_fold_caches.
2016-02-08 Jason Merrill <jason@redhat.com>
* cp-tree.h (CONV_FOLD, CONV_BACKEND_CONVERT): New.

5
gcc/cp/constexpr.c
View File

@ -4098,12 +4098,13 @@ maybe_constant_value (tree t, tree decl)
return ret;
}
/* Dispose of the whole CV_CACHE. */
/* Dispose of the whole CV_CACHE and FOLD_CACHE. */
void
clear_cv_cache (void)
clear_cv_and_fold_caches (void)
{
gt_cleare_cache (cv_cache);
clear_fold_cache ();
}
/* Like maybe_constant_value but first fully instantiate the argument.

2
gcc/cp/cp-tree.h
View File

@ -6922,7 +6922,7 @@ extern bool var_in_constexpr_fn (tree);
extern void explain_invalid_constexpr_fn (tree);
extern vec<tree> cx_error_context (void);
extern tree fold_sizeof_expr (tree);
extern void clear_cv_cache (void);
extern void clear_cv_and_fold_caches (void);
/* In c-family/cilk.c */
extern bool cilk_valid_spawn (tree);

3
gcc/cp/decl.c
View File

@ -13414,8 +13414,7 @@ finish_enum_value_list (tree enumtype)
/* Each enumerator now has the type of its enumeration. Clear the cache
so that this change in types doesn't confuse us later on. */
clear_cv_cache ();
clear_fold_cache ();
clear_cv_and_fold_caches ();
}
/* Finishes the enum type. This is called only the first time an

3
gcc/cp/typeck2.c
View File

@ -837,6 +837,9 @@ store_init_value (tree decl, tree init, vec<tree, va_gc>** cleanups, int flags)
/* Handle aggregate NSDMI in non-constant initializers, too. */
value = replace_placeholders (value, decl);
/* DECL may change value; purge caches. */
clear_cv_and_fold_caches ();
/* If the initializer is not a constant, fill in DECL_INITIAL with
the bits that are constant, and then return an expression that
will perform the dynamic initialization. */

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2016-02-08 Marek Polacek <polacek@redhat.com>
PR c++/69688
* g++.dg/init/const12.C: New test.
2016-02-08 Bernd Schmidt <bschmidt@redhat.com>
PR target/60410

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

@ -0,0 +1,20 @@
// PR c++/69688
// { dg-do compile }
// { dg-options "-Wsign-compare" }
struct S
{
static const int s;
static const char c[];
static wchar_t w[];
S ()
{
for (int i = 0; i < s; i++)
w[i] = 0;
}
};
const char S::c[] = "x";
const int S::s = sizeof (S::c) - 1;
wchar_t S::w[S::s];