re PR c++/56481 (endless loop compiling a C++ file)

	PR c++/56481
	* semantics.c (potential_constant_expression_1): Use
	cxx_eval_outermost_constant_expr rather than maybe_constant_value.

From-SVN: r196358

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 90110ded59fa66319f1b4b44f948a3bbd8711e79..11ea5d437521820cf6a804d2b452a74515ea9bd4 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2013-02-28  Jason Merrill  <jason@redhat.com>
 
+       PR c++/56481
+       * semantics.c (potential_constant_expression_1): Use
+       cxx_eval_outermost_constant_expr rather than maybe_constant_value.
+
        PR c++/56243
        * call.c (build_over_call): Avoid virtual lookup in a template.
 

diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 9446f831bd5fac0dfc1c1bed76983a144a77b7e6..8038aa26e4800ea99de241f28b40e7d4261db701 100644 (file)
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -8683,10 +8683,12 @@ potential_constant_expression_1 (tree t, bool want_rval, tsubst_flags_t flags)
     case ROUND_MOD_EXPR:
       {
        tree denom = TREE_OPERAND (t, 1);
-       /* We can't call maybe_constant_value on an expression
+       if (!potential_constant_expression_1 (denom, rval, flags))
+         return false;
+       /* We can't call cxx_eval_outermost_constant_expr on an expression
           that hasn't been through fold_non_dependent_expr yet.  */
        if (!processing_template_decl)
-         denom = maybe_constant_value (denom);
+         denom = cxx_eval_outermost_constant_expr (denom, true);
        if (integer_zerop (denom))
          {
            if (flags & tf_error)
@@ -8696,7 +8698,8 @@ potential_constant_expression_1 (tree t, bool want_rval, tsubst_flags_t flags)
        else
          {
            want_rval = true;
-           goto binary;
+           return potential_constant_expression_1 (TREE_OPERAND (t, 0),
+                                                   want_rval, flags);
          }
       }
 
@@ -8731,7 +8734,7 @@ potential_constant_expression_1 (tree t, bool want_rval, tsubst_flags_t flags)
        if (!potential_constant_expression_1 (op, rval, flags))
          return false;
        if (!processing_template_decl)
-         op = maybe_constant_value (op);
+         op = cxx_eval_outermost_constant_expr (op, true);
        if (tree_int_cst_equal (op, tmp))
          return potential_constant_expression_1 (TREE_OPERAND (t, 1), rval, flags);
        else
@@ -8793,7 +8796,7 @@ potential_constant_expression_1 (tree t, bool want_rval, tsubst_flags_t flags)
       if (!potential_constant_expression_1 (tmp, rval, flags))
        return false;
       if (!processing_template_decl)
-       tmp = maybe_constant_value (tmp);
+       tmp = cxx_eval_outermost_constant_expr (tmp, true);
       if (integer_zerop (tmp))
        return potential_constant_expression_1 (TREE_OPERAND (t, 2),
                                                want_rval, flags);