From: Olga Golovanevsky Date: Fri, 25 Jan 2008 07:47:46 +0000 (+0000) Subject: [multiple changes] X-Git-Tag: releases/gcc-4.3.0~416 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd91d74392900e18b3eb5c06ddd39cd06977890a;p=thirdparty%2Fgcc.git [multiple changes] 2008-01-25 Golovanevsky Olga * ipa-struct-reorg.c (is_safe_cond_expr, create_new_stmts_for_cond_expr): Use integer_zerop function, that recognize not only zero-pointer, but zero-integer too. 2008-01-24 Olga Golovanevsky * gcc.dg/struct/wo_prof_malloc_size_var.c: UnXFAIL. From-SVN: r131817 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f24d973d0fa4..cf427b45ab57 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2008-01-25 Golovanevsky Olga + + * ipa-struct-reorg.c (is_safe_cond_expr, + create_new_stmts_for_cond_expr): Use integer_zerop function, + that recognize not only zero-pointer, but zero-integer too. + 2008-01-25 Ben Elliston PR other/22232 diff --git a/gcc/ipa-struct-reorg.c b/gcc/ipa-struct-reorg.c index 04948a33c099..9786db47a366 100644 --- a/gcc/ipa-struct-reorg.c +++ b/gcc/ipa-struct-reorg.c @@ -1251,12 +1251,15 @@ create_new_stmts_for_cond_expr (tree stmt) s0 = (str0 != length) ? true : false; s1 = (str1 != length) ? true : false; - gcc_assert ((!s0 && s1) || (!s1 && s0)); + gcc_assert (s0 || s1); + /* For now we allow only comparison with 0 or NULL. */ + gcc_assert (integer_zerop (arg0) || integer_zerop (arg1)); - str = s0 ? VEC_index (structure, structures, str0): - VEC_index (structure, structures, str1); - arg = s0 ? arg0 : arg1; - pos = s0 ? 0 : 1; + str = integer_zerop (arg0) ? + VEC_index (structure, structures, str1): + VEC_index (structure, structures, str0); + arg = integer_zerop (arg0) ? arg1 : arg0; + pos = integer_zerop (arg0) ? 1 : 0; for (i = 0; VEC_iterate (tree, str->new_types, i, type); i++) { @@ -2388,8 +2391,12 @@ is_safe_cond_expr (tree cond_stmt) s0 = (str0 != length) ? true : false; s1 = (str1 != length) ? true : false; + + if (!s0 && !s1) + return false; - if (!((!s0 && s1) || (!s1 && s0))) + /* For now we allow only comparison with 0 or NULL. */ + if (!integer_zerop (arg0) && !integer_zerop (arg1)) return false; return true; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 8af0ba245b44..8705d66744b2 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2008-01-25 Olga Golovanevsky + + * gcc.dg/struct/wo_prof_malloc_size_var.c: UnXFAIL. + 2008-01-24 Daniel Franke PR fortran/34202 diff --git a/gcc/testsuite/gcc.dg/struct/wo_prof_malloc_size_var.c b/gcc/testsuite/gcc.dg/struct/wo_prof_malloc_size_var.c index b1614c0faaa4..32842b0a7eb1 100644 --- a/gcc/testsuite/gcc.dg/struct/wo_prof_malloc_size_var.c +++ b/gcc/testsuite/gcc.dg/struct/wo_prof_malloc_size_var.c @@ -32,6 +32,5 @@ main () } /*--------------------------------------------------------------------------*/ -/* Currently the condition `if (p == 0)` is incorrectly reported as unsafe. */ -/* { dg-final { scan-ipa-dump "Number of structures to transform is 1" "ipa_struct_reorg" { xfail *-*-* } } } */ +/* { dg-final { scan-ipa-dump "Number of structures to transform is 1" "ipa_struct_reorg" } } */ /* { dg-final { cleanup-ipa-dump "*" } } */