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

re PR c++/28284 (ICE with invalid static const variable)

Browse source 
PR c++/28284
        * pt.c (fold_non_dependent_expr): Make sure expr is not dereferenced if it
        is NULL.

From-SVN: r116755
This commit is contained in:
Simon Martin 2006-09-07 17:25:05 +00:00 • committed by Jason Merrill
parent c387622634
commit d4a200d359
3 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gcc/cp/ChangeLog
View file

@ -1,3 +1,9 @@
2006-09-07 Simon Martin <simartin@users.sourceforge.net>
PR c++/28284
* pt.c (fold_non_dependent_expr): Make sure expr is not dereferenced if it
is NULL.
2006-09-06 Zak Kipling <zak@transversal.com>
PR c++/26195

3
gcc/cp/pt.c
View file

@ -3410,6 +3410,9 @@ redeclare_class_template (tree type, tree parms)
tree
fold_non_dependent_expr (tree expr)
{
if (expr == NULL_TREE)
return NULL_TREE;
/* If we're in a template, but EXPR isn't value dependent, simplify
it. We're supposed to treat:

12
gcc/testsuite/g++.dg/template/pr28284.C Normal file
View file

@ -0,0 +1,12 @@
/* { dg-do compile } */
template<int> struct A
{
static const int i=x; /* { dg-error "was not declared in this scope" } */
static const int j, k;
};
template<int N> const int A<N>::j = i;
template<int N> const int A<N>::k = j;
A<0> a;