* constexpr.c (fold_simple): Simplify.

From-SVN: r256899

gcc/cp/ChangeLog

+2018-01-19  Marek Polacek  <polacek@redhat.com>
+
+	* constexpr.c (fold_simple): Simplify.
+
 2018-01-18  Jason Merrill  <jason@redhat.com>
 
 	PR c++/83714

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.