diff options
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/except.c | 8 |
2 files changed, 12 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index b5b2b04..a4024ef 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2009-11-20 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/42060 + * except.c (build_throw): Check the tree returned by + decay_conversion for error_mark_node. + 2009-11-20 Shujing Zhao <pearly.zhao@oracle.com> PR c++/29017 diff --git a/gcc/cp/except.c b/gcc/cp/except.c index 1b13819..66dc14e 100644 --- a/gcc/cp/except.c +++ b/gcc/cp/except.c @@ -752,8 +752,12 @@ build_throw (tree exp) } } else - exp = build2 (INIT_EXPR, temp_type, object, - decay_conversion (exp)); + { + tmp = decay_conversion (exp); + if (tmp == error_mark_node) + return error_mark_node; + exp = build2 (INIT_EXPR, temp_type, object, tmp); + } /* Pre-evaluate the thrown expression first, since if we allocated the space first we would have to deal with cleaning it up if |