re PR c++/48265 ([C++0x] ICE: SIGSEGV (recursion in value_dependent_expression_p...

	PR c++/48265
	* pt.c (value_dependent_expression_p) [VAR_DECL]: Make sure
	the variable is constant before looking at its initializer.

From-SVN: r171714

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c4df48dd746101c03236df5be7aacdb8fea5e5df..855844688b66fdaec513e03648013f6aa405c3fa 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2011-03-29  Jason Merrill  <jason@redhat.com>
 
+       PR c++/48265
+       * pt.c (value_dependent_expression_p) [VAR_DECL]: Make sure
+       the variable is constant before looking at its initializer.
+
        PR c++/48319
        * pt.c (value_dependent_expression_p): Handle TEMPLATE_ID_EXPR.
 

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index aa0901be3be8f2e8cc6796e6ecf52a298becbdce..5960e4624b633ed9681bf99b52d4e298ec58b429 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -18085,10 +18085,10 @@ value_dependent_expression_p (tree expression)
       return value_dependent_expression_p (DECL_INITIAL (expression));
 
     case VAR_DECL:
-       /* A constant with integral or enumeration type and is initialized
+       /* A constant with literal type and is initialized
          with an expression that is value-dependent.  */
       if (DECL_INITIAL (expression)
-         && INTEGRAL_OR_ENUMERATION_TYPE_P (TREE_TYPE (expression))
+         && decl_constant_var_p (expression)
          && value_dependent_expression_p (DECL_INITIAL (expression)))
        return true;
       return false;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 48199a2fb7bdd817954639ed954c7a8cebab1ab7..ede28b20e37e2ff34ee089ea644c48c222212d7e 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-29  Jason Merrill  <jason@redhat.com>
+
+       * g++.dg/cpp0x/regress/value-dep1.C: New.
+
 2011-03-29  Steve Ellcey  <sje@cup.hp.com>
 
        * gcc.dg/torture/pr47917.c: Use -std=gnu99 on HP-UX.

diff --git a/gcc/testsuite/g++.dg/cpp0x/regress/value-dep1.C b/gcc/testsuite/g++.dg/cpp0x/regress/value-dep1.C
new file mode 100644 (file)
index 0000000..112389d
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/regress/value-dep1.C
@@ -0,0 +1,7 @@
+// PR c++/48265
+// { dg-options -std=c++0x }
+
+template < int > struct S
+{
+  S () { const int i = i; i; };
+};