aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/gimplify.c3
2 files changed, 6 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2f23a2b..617dba9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,8 +1,12 @@
+2017-12-20 Paolo Carlini <paolo.carlini@oracle.com>
+
+ * gimplify.c (gimplify_return_expr): Remove dead error_mark_node check.
+
2017-12-20 Martin Sebor <msebor@redhat.com>
PR testsuite/83131
* builtins.c (expand_builtin_strlen): Use get_callee_fndecl.
- (expand_builtin_strcmp): Call maybe_warn_nonstring_arg.
+ (expand_builtin_strcmp): Call maybe_warn_nonstring_arg.
(expand_builtin_strncmp): Same.
2017-12-20 Alexandre Oliva <aoliva@redhat.com>
diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index 9da4625..9475807 100644
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -1500,8 +1500,7 @@ gimplify_return_expr (tree stmt, gimple_seq *pre_p)
return GS_ERROR;
if (!ret_expr
- || TREE_CODE (ret_expr) == RESULT_DECL
- || ret_expr == error_mark_node)
+ || TREE_CODE (ret_expr) == RESULT_DECL)
{
maybe_add_early_return_predict_stmt (pre_p);
greturn *ret = gimple_build_return (ret_expr);