* pt.c (value_dependent_expression_p) [NOEXCEPT_EXPR]: Avoid

	using an uninitialized variable.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@160300 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index fec4bfdde7cc36c62b56739811610f6029a75fab..a67de73c802e9a8526d3d32425344e997dd6a80b 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2010-06-04  Jason Merrill  <jason@redhat.com>
 
+       * pt.c (value_dependent_expression_p) [NOEXCEPT_EXPR]: Avoid
+       using an uninitialized variable.
+
        * cxx-pretty-print.c (pp_cxx_unary_expression): Handle NOEXCEPT_EXPR.
        (pp_cxx_expression): Likewise.
 

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 4c98bf276ede55b62944cfcca29aa5ee75c60350..d7c03821771501958968a3e9e40fc2f1b514b314 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -17596,9 +17596,14 @@ value_dependent_expression_p (tree expression)
         return true;
       else if (TYPE_P (expression))
        return dependent_type_p (expression);
-    case NOEXCEPT_EXPR:
       return type_dependent_expression_p (expression);
 
+    case NOEXCEPT_EXPR:
+      expression = TREE_OPERAND (expression, 0);
+      /* FIXME why check value-dependency?  */
+      return (type_dependent_expression_p (expression)
+             || value_dependent_expression_p (expression));
+
     case SCOPE_REF:
       return dependent_scope_ref_p (expression, value_dependent_expression_p);