aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvries <vries@138bc75d-0d04-0410-961f-82ee72b054a4>2016-05-07 07:02:36 +0000
committervries <vries@138bc75d-0d04-0410-961f-82ee72b054a4>2016-05-07 07:02:36 +0000
commit0d2ebb3e677036cc5594e18bdc94b19999ba2f4d (patch)
tree6ea974b8f65928c76fa11408908935769087098b
parent3dacb00fcddf8a05bbe9b7f5aa24a9e5c3e40ff8 (diff)
backport "Handle NULL def in build_cross_bb_scalars_def"
2016-05-07 Tom de Vries <tom@codesourcery.com> backport: 2016-05-07 Tom de Vries <tom@codesourcery.com> PR tree-optimization/70956 * graphite-scop-detection.c (build_cross_bb_scalars_def): Handle NULL def. * gcc.dg/graphite/pr70956.c: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-6-branch@235995 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog9
-rw-r--r--gcc/graphite-scop-detection.c3
-rw-r--r--gcc/testsuite/ChangeLog8
-rw-r--r--gcc/testsuite/gcc.dg/graphite/pr70956.c4
4 files changed, 22 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5f8de4a12a4..0962f977e63 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2016-05-07 Tom de Vries <tom@codesourcery.com>
+
+ backport:
+ 2016-05-07 Tom de Vries <tom@codesourcery.com>
+
+ PR tree-optimization/70956
+ * graphite-scop-detection.c (build_cross_bb_scalars_def): Handle NULL
+ def.
+
2016-05-06 Marek Polacek <polacek@redhat.com>
Backported from mainline
diff --git a/gcc/graphite-scop-detection.c b/gcc/graphite-scop-detection.c
index 7615842b332..dd50a1e4ec0 100644
--- a/gcc/graphite-scop-detection.c
+++ b/gcc/graphite-scop-detection.c
@@ -1722,8 +1722,7 @@ static void
build_cross_bb_scalars_def (scop_p scop, tree def, basic_block def_bb,
vec<tree> *writes)
{
- gcc_assert (def);
- if (!is_gimple_reg (def))
+ if (!def || !is_gimple_reg (def))
return;
/* Do not gather scalar variables that can be analyzed by SCEV as they can be
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 500bccdb161..b4380126520 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2016-05-07 Tom de Vries <tom@codesourcery.com>
+
+ backport:
+ 2016-05-07 Tom de Vries <tom@codesourcery.com>
+
+ PR tree-optimization/70956
+ * gcc.dg/graphite/pr70956.c: New test.
+
2016-05-06 Marek Polacek <polacek@redhat.com>
Backported from mainline
diff --git a/gcc/testsuite/gcc.dg/graphite/pr70956.c b/gcc/testsuite/gcc.dg/graphite/pr70956.c
new file mode 100644
index 00000000000..31fc25f4638
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/graphite/pr70956.c
@@ -0,0 +1,4 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -fgraphite-identity" } */
+
+#include "../tree-ssa/vrp66.c"