aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorAldy Hernandez <aldyh@redhat.com>2021-05-13 16:09:58 -0400
committerAldy Hernandez <aldyh@redhat.com>2021-05-17 18:18:37 +0200
commitce81282261c6c77883b17d0ebfbbe337bed76457 (patch)
treed53f50b5dd7ed93644b1598dec40f43bf8ddb3ac /gcc
parente91a17fe39c39e98cebe6e1cbc8064ee6846a3a7 (diff)
downloadgcc-ce81282261c6c77883b17d0ebfbbe337bed76457.zip
gcc-ce81282261c6c77883b17d0ebfbbe337bed76457.tar.gz
gcc-ce81282261c6c77883b17d0ebfbbe337bed76457.tar.bz2
Bail in bounds_of_var_in_loop if scev returns NULL.
Both initial_condition_in_loop_num and evolution_part_in_loop_num can return NULL. This patch exits if either one is NULL. Presumably this didn't happen before, because adjust_range_with_scev was called far less frequently than in ranger, which can call it for every PHI. gcc/ChangeLog: PR tree-optimization/100349 * vr-values.c (bounds_of_var_in_loop): Bail if scev returns NULL. gcc/testsuite/ChangeLog: * gcc.dg/pr100349.c: New test.
Diffstat (limited to 'gcc')
-rw-r--r--gcc/testsuite/gcc.dg/pr100349.c16
-rw-r--r--gcc/vr-values.c3
2 files changed, 19 insertions, 0 deletions
diff --git a/gcc/testsuite/gcc.dg/pr100349.c b/gcc/testsuite/gcc.dg/pr100349.c
new file mode 100644
index 0000000..dd7977a
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr100349.c
@@ -0,0 +1,16 @@
+// { dg-do compile }
+// { dg-options "-O2 -w" }
+
+#include <stdint.h>
+uint8_t a;
+b(int8_t c) {
+ int d;
+e:
+ uint32_t f;
+ for (;;)
+ for (c = 10; c; c++)
+ if (0 > (a = c) ?: d) {
+ f = a;
+ goto e;
+ }
+}
diff --git a/gcc/vr-values.c b/gcc/vr-values.c
index 08b237b..b1bf53a 100644
--- a/gcc/vr-values.c
+++ b/gcc/vr-values.c
@@ -1650,6 +1650,9 @@ bounds_of_var_in_loop (tree *min, tree *max, range_query *query,
init = initial_condition_in_loop_num (chrec, loop->num);
step = evolution_part_in_loop_num (chrec, loop->num);
+ if (!init || !step)
+ return false;
+
/* If INIT is an SSA with a singleton range, set INIT to said
singleton, otherwise leave INIT alone. */
if (TREE_CODE (init) == SSA_NAME)