Fix null pointer crash and a merge error

From-SVN: r55884
This commit is contained in:
Bernd Schmidt 2002-07-30 21:48:13 +00:00 committed by Bernd Schmidt
parent 0559cc7752
commit 26e20555c3
2 changed files with 8 additions and 11 deletions

View File

@ -1,3 +1,8 @@
2002-07-30 Bernd Schmidt <bernds@redhat.com>
* ifcvt.c (cond_exec_process_if_block): Fix a merging error.
Bail out early if false_expr is NULL and we'd crash due to this.
2002-07-30 David Edelsohn <edelsohn@gnu.org>
Zack Weinberg <zack@codesourcery.com>

View File

@ -423,17 +423,6 @@ cond_exec_process_if_block (ce_info, do_multiple_p)
else
false_expr = NULL_RTX;
#ifdef IFCVT_MODIFY_TESTS
/* If the machine description needs to modify the tests, such as setting a
conditional execution register from a comparison, it can do so here. */
IFCVT_MODIFY_TESTS (true_expr, false_expr, test_bb, then_bb, else_bb,
join_bb);
/* See if the conversion failed */
if (!true_expr || !false_expr)
goto fail;
#endif
#ifdef IFCVT_MODIFY_TESTS
/* If the machine description needs to modify the tests, such as setting a
conditional execution register from a comparison, it can do so here. */
@ -460,6 +449,9 @@ cond_exec_process_if_block (ce_info, do_multiple_p)
basic_block bb = test_bb;
basic_block last_test_bb = ce_info->last_test_bb;
if (! false_expr)
goto fail;
do
{
rtx start, end;