summaryrefslogtreecommitdiff
path: root/gcc/c-family
diff options
context:
space:
mode:
authormpolacek <mpolacek@138bc75d-0d04-0410-961f-82ee72b054a4>2017-06-13 17:30:58 +0000
committermpolacek <mpolacek@138bc75d-0d04-0410-961f-82ee72b054a4>2017-06-13 17:30:58 +0000
commit314b419618daf524daca972f195bee1ba859a455 (patch)
tree81afa16446d96529f082d5711253f86fc3ed1271 /gcc/c-family
parent0a35be0ffec7846430a5ff840a94c24669f1a5cc (diff)
downloadgcc-314b419618daf524daca972f195bee1ba859a455.tar.gz
PR objc/80949
* c-warn.c (do_warn_duplicated_branches): Return if any of the branches is null. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@249171 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/c-family')
-rw-r--r--gcc/c-family/ChangeLog6
-rw-r--r--gcc/c-family/c-warn.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 84887683337..9387bb079c6 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,9 @@
+2017-06-13 Marek Polacek <polacek@redhat.com>
+
+ PR objc/80949
+ * c-warn.c (do_warn_duplicated_branches): Return if any of the
+ branches is null.
+
2017-06-13 Martin Liska <mliska@suse.cz>
PR sanitize/78204
diff --git a/gcc/c-family/c-warn.c b/gcc/c-family/c-warn.c
index 35321a6cb1b..056a058ca77 100644
--- a/gcc/c-family/c-warn.c
+++ b/gcc/c-family/c-warn.c
@@ -2354,8 +2354,8 @@ do_warn_duplicated_branches (tree expr)
tree thenb = COND_EXPR_THEN (expr);
tree elseb = COND_EXPR_ELSE (expr);
- /* Don't bother if there's no else branch. */
- if (elseb == NULL_TREE)
+ /* Don't bother if any of the branches is missing. */
+ if (thenb == NULL_TREE || elseb == NULL_TREE)
return;
/* And don't warn for empty statements. */