* constexpr.c (fold_simple): Simplify.

From-SVN: r256899

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index d23bfc433a5c5810526f364464ea088ae2cbb81d..3e40d79e95230aeeab4aec212b6346822659594e 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2018-01-19  Marek Polacek  <polacek@redhat.com>
+
+       * constexpr.c (fold_simple): Simplify.
+
 2018-01-18  Jason Merrill  <jason@redhat.com>
 
        PR c++/83714

diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c
index 9a548d29bbc10fce096519c7102c86fbbb89acec..ca7f369f7e948e2b5ec46dbd7fcd7b3be588894a 100644 (file)
--- a/gcc/cp/constexpr.c
+++ b/gcc/cp/constexpr.c
@@ -4931,22 +4931,21 @@ fold_simple_1 (tree t)
 }
 
 /* If T is a simple constant expression, returns its simplified value.
-   Otherwise returns T.  In contrast to maybe_constant_value do we
+   Otherwise returns T.  In contrast to maybe_constant_value we
    simplify only few operations on constant-expressions, and we don't
    try to simplify constexpressions.  */
 
 tree
 fold_simple (tree t)
 {
-  tree r = NULL_TREE;
   if (processing_template_decl)
     return t;
 
-  r = fold_simple_1 (t);
-  if (!r)
-    r = t;
+  tree r = fold_simple_1 (t);
+  if (r)
+    return r;
 
-  return r;
+  return t;
 }
 
 /* If T is a constant expression, returns its reduced value.