mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-02-05 10:10:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

re PR c/17297 (ICE with FP vector constructor containing qnan calculation)

Browse Source 
PR c/17297
	* c-typeck.c (digest_init): Only call build_vector if all constructor
	elements are *_CST nodes.
	* gimplify.c (gimplify_init_constructor): Likewise.

	* gcc.c-torture/compile/20050113-1.c: New testcase.

	PR middle-end/19164
	* c-typeck.c (digest_init): Only call build_vector if inside_init
	is a CONSTRUCTOR.

	* gcc.dg/20050113-1.c: New testcase.

From-SVN: r93891
This commit is contained in:
Jakub Jelinek 2005-01-19 10:27:23 +01:00 committed by Jakub Jelinek
parent f0b9dcb843
commit e89be13bdf
6 changed files with 90 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gcc/ChangeLog
View File

@ -1,3 +1,14 @@
2005-01-19 Jakub Jelinek <jakub@redhat.com>
PR c/17297
* c-typeck.c (digest_init): Only call build_vector if all constructor
elements are *_CST nodes.
* gimplify.c (gimplify_init_constructor): Likewise.
PR middle-end/19164
* c-typeck.c (digest_init): Only call build_vector if inside_init
is a CONSTRUCTOR.
2005-01-18 Tobias Schl"uter <tobias.schlueter@physik.uni-muenchen.de>
* toplev.c (init_asm_output): Remove dead #ifdef.

38
gcc/c-typeck.c
View File

@ -4143,18 +4143,32 @@ digest_init (tree type, tree init, bool strict_string, int require_constant)
/* Build a VECTOR_CST from a *constant* vector constructor. If the
vector constructor is not constant (e.g. {1,2,3,foo()}) then punt
below and handle as a constructor. */
if (code == VECTOR_TYPE
&& TREE_CODE (TREE_TYPE (inside_init)) == VECTOR_TYPE
&& vector_types_convertible_p (TREE_TYPE (inside_init), type)
&& TREE_CONSTANT (inside_init))
{
if (TREE_CODE (inside_init) == VECTOR_CST
&& comptypes (TYPE_MAIN_VARIANT (TREE_TYPE (inside_init)),
TYPE_MAIN_VARIANT (type)))
return inside_init;
else
return build_vector (type, CONSTRUCTOR_ELTS (inside_init));
}
if (code == VECTOR_TYPE
&& TREE_CODE (TREE_TYPE (inside_init)) == VECTOR_TYPE
&& vector_types_convertible_p (TREE_TYPE (inside_init), type)
&& TREE_CONSTANT (inside_init))
{
if (TREE_CODE (inside_init) == VECTOR_CST
&& comptypes (TYPE_MAIN_VARIANT (TREE_TYPE (inside_init)),
TYPE_MAIN_VARIANT (type)))
return inside_init;
if (TREE_CODE (inside_init) == CONSTRUCTOR)
{
tree link;
/* Iterate through elements and check if all constructor
elements are *_CSTs. */
for (link = CONSTRUCTOR_ELTS (inside_init);
link;
link = TREE_CHAIN (link))
if (! CONSTANT_CLASS_P (TREE_VALUE (link)))
break;
if (link == NULL)
return build_vector (type, CONSTRUCTOR_ELTS (inside_init));
}
}
/* Any type can be initialized
from an expression of the same type, optionally with braces. */

33
gcc/gimplify.c
View File

@ -2761,20 +2761,33 @@ gimplify_init_constructor (tree *expr_p, tree *pre_p,
case VECTOR_TYPE:
/* Go ahead and simplify constant constructors to VECTOR_CST. */
if (TREE_CONSTANT (ctor))
TREE_OPERAND (*expr_p, 1) = build_vector (type, elt_list);
else
{
/* Vector types use CONSTRUCTOR all the way through gimple
compilation as a general initializer. */
for (; elt_list; elt_list = TREE_CHAIN (elt_list))
tree tem;
/* Even when ctor is constant, it might contain non-*_CST
elements (e.g. { 1.0/0.0 - 1.0/0.0, 0.0 }) and those don't
belong into VECTOR_CST nodes. */
for (tem = elt_list; tem; tem = TREE_CHAIN (tem))
if (! CONSTANT_CLASS_P (TREE_VALUE (tem)))
break;
if (! tem)
{
enum gimplify_status tret;
tret = gimplify_expr (&TREE_VALUE (elt_list), pre_p, post_p,
is_gimple_val, fb_rvalue);
if (tret == GS_ERROR)
ret = GS_ERROR;
TREE_OPERAND (*expr_p, 1) = build_vector (type, elt_list);
break;
}
}
/* Vector types use CONSTRUCTOR all the way through gimple
compilation as a general initializer. */
for (; elt_list; elt_list = TREE_CHAIN (elt_list))
{
enum gimplify_status tret;
tret = gimplify_expr (&TREE_VALUE (elt_list), pre_p, post_p,
is_gimple_val, fb_rvalue);
if (tret == GS_ERROR)
ret = GS_ERROR;
}
break;
default:

8
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,11 @@
2005-01-19 Jakub Jelinek <jakub@redhat.com>
PR c/17297
* gcc.c-torture/compile/20050113-1.c: New testcase.
PR middle-end/19164
* gcc.dg/20050113-1.c: New testcase.
2005-01-19 Dorit Naishlos <dorit@il.ibm.com>
* gcc.dg/vect/vect-85.c: Add comment.

16
gcc/testsuite/gcc.c-torture/compile/20050113-1.c Normal file
View File

@ -0,0 +1,16 @@
/* PR c/17297 */
typedef float V2SF __attribute__ ((vector_size (8)));
int test0 (V2SF, V2SF);
int
main (void)
{
V2SF a = (V2SF) {1.0f/0.0f - 1.0f/0.0f, 1.0f/0.0f - 1.0f/0.0f};
V2SF b = (V2SF) {567.345, 1984.0};
int i;
i = test0 (a, b);
return i;
}

6
gcc/testsuite/gcc.dg/20050113-1.c Normal file
View File

@ -0,0 +1,6 @@
/* PR middle-end/19164 */
/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
/* { dg-options "-mmmx" } */
typedef short int V __attribute__ ((vector_size (8)));
static V v = (V) 0x00FF00FF00FF00FFLL; /* { dg-error "is not constant" } */