From 6d3bf8498df74204a3cb0a74481634313d892fd6 Mon Sep 17 00:00:00 2001 From: Uros Bizjak Date: Fri, 12 Oct 2007 10:37:17 +0200 Subject: [PATCH] re PR tree-optimization/33742 (Segfault in vectorizable_operation) PR tree-optimization/33742 * tree-vect-transform.c (vectorizable_operation): Return false if get_vectype_for_scalar_type for scalar_dest can't be determined. (vectorizable_call): Same for rhs_type and lhs_type. testsuite/ChangeLog: PR tree-optimization/33742 * gcc.dg/pr33742.c: New testcase. From-SVN: r129255 --- gcc/ChangeLog | 7 +++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/pr33742.c | 16 ++++++++++++++++ gcc/tree-vect-transform.c | 6 ++++++ 4 files changed, 34 insertions(+) create mode 100644 gcc/testsuite/gcc.dg/pr33742.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c1f44631d68..28590a6c41b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2007-10-12 Uros Bizjak + + PR tree-optimization/33742 + * tree-vect-transform.c (vectorizable_operation): Return false + if get_vectype_for_scalar_type for scalar_dest can't be determined. + (vectorizable_call): Same for rhs_type and lhs_type. + 2007-10-12 Jakub Jelinek PR tree-optimization/33645 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 79626fc1172..cacf0a9ed7d 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2007-10-12 Uros Bizjak + + PR tree-optimization/33742 + * gcc.dg/pr33742.c: New testcase. + 2007-10-12 Jakub Jelinek PR tree-optimization/33645 diff --git a/gcc/testsuite/gcc.dg/pr33742.c b/gcc/testsuite/gcc.dg/pr33742.c new file mode 100644 index 00000000000..b905d9ddad9 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr33742.c @@ -0,0 +1,16 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -ftree-vectorize" } */ + +typedef unsigned short ush; +extern ush prev[]; + +void fill_window () +{ + register unsigned n, m; + + for (n = 0; n < 32768; n++) + { + m = prev[n]; + prev[n] = (ush) (m >= 0x8000 ? m - 0x8000 : 0); + } +} diff --git a/gcc/tree-vect-transform.c b/gcc/tree-vect-transform.c index f02d912b29f..423ae65d964 100644 --- a/gcc/tree-vect-transform.c +++ b/gcc/tree-vect-transform.c @@ -3016,10 +3016,14 @@ vectorizable_call (tree stmt, block_stmt_iterator *bsi, tree *vec_stmt) return false; vectype_in = get_vectype_for_scalar_type (rhs_type); + if (!vectype_in) + return false; nunits_in = TYPE_VECTOR_SUBPARTS (vectype_in); lhs_type = TREE_TYPE (GIMPLE_STMT_OPERAND (stmt, 0)); vectype_out = get_vectype_for_scalar_type (lhs_type); + if (!vectype_out) + return false; nunits_out = TYPE_VECTOR_SUBPARTS (vectype_out); /* FORNOW */ @@ -3804,6 +3808,8 @@ vectorizable_operation (tree stmt, block_stmt_iterator *bsi, tree *vec_stmt, scalar_dest = GIMPLE_STMT_OPERAND (stmt, 0); vectype_out = get_vectype_for_scalar_type (TREE_TYPE (scalar_dest)); + if (!vectype_out) + return false; nunits_out = TYPE_VECTOR_SUBPARTS (vectype_out); if (nunits_out != nunits_in) return false; -- 2.30.2