diff options
| author | Nathan Sidwell <nathan@acm.org> | 1999-08-24 20:49:12 +0000 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 1999-08-24 16:49:12 -0400 |
| commit | 2ac84cfe01bfb92a83f18263740435f696321e32 (patch) | |
| tree | daa01fc0f611dbb0f5dbc26dadf1e8aa3145eecb /gcc | |
| parent | 1da93fe012a0f34e4c50f3ccc98bd8a21ab396d3 (diff) | |
| download | gcc-2ac84cfe01bfb92a83f18263740435f696321e32.zip gcc-2ac84cfe01bfb92a83f18263740435f696321e32.tar.gz gcc-2ac84cfe01bfb92a83f18263740435f696321e32.tar.bz2 | |
expr.c (expand_expr): Cope with COND_EXPRs with one non-returning branch.
* expr.c (expand_expr): Cope with COND_EXPRs with one
non-returning branch.
From-SVN: r28825
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/expr.c | 9 |
2 files changed, 12 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 4681f69..b107d30 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +Tue Aug 24 13:48:39 1999 Nathan Sidwell <nathan@acm.org> + + * expr.c (expand_expr): Cope with COND_EXPRs with one + non-returning branch. + Mon Aug 23 22:28:16 1999 Mark Mitchell <mark@codesourcery.com> * expr.c (store_expr): Always pass down the target, even when not @@ -7700,7 +7700,11 @@ expand_expr (exp, target, tmode, modifier) jumpifnot (TREE_OPERAND (exp, 0), op0); start_cleanup_deferral (); - if (temp != 0) + + /* One branch of the cond can be void, if it never returns. For + example A ? throw : E */ + if (temp != 0 + && TREE_TYPE (TREE_OPERAND (exp, 1)) != void_type_node) store_expr (TREE_OPERAND (exp, 1), temp, 0); else expand_expr (TREE_OPERAND (exp, 1), @@ -7711,7 +7715,8 @@ expand_expr (exp, target, tmode, modifier) emit_barrier (); emit_label (op0); start_cleanup_deferral (); - if (temp != 0) + if (temp != 0 + && TREE_TYPE (TREE_OPERAND (exp, 2)) != void_type_node) store_expr (TREE_OPERAND (exp, 2), temp, 0); else expand_expr (TREE_OPERAND (exp, 2), |