diff options
| author | Jason Merrill <jason@redhat.com> | 2014-07-12 12:36:25 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2014-07-12 12:36:25 -0400 |
| commit | 0eb5f1586fa04fd82180135917b2c80511473c6b (patch) | |
| tree | a7270f85e19818e76c72293419651452fb823131 /gcc | |
| parent | c59f7203283d1faa48a42075eef2a07ca0454a21 (diff) | |
| download | gcc-0eb5f1586fa04fd82180135917b2c80511473c6b.zip gcc-0eb5f1586fa04fd82180135917b2c80511473c6b.tar.gz gcc-0eb5f1586fa04fd82180135917b2c80511473c6b.tar.bz2 | |
re PR c++/22434 (ICE in simplify_{,gen_}subreg)
PR c++/22434
PR c++/61288
* call.c (build_conditional_expr_1): Avoid reading freed memory.
From-SVN: r212482
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/call.c | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index c301799..88d7c85 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2014-07-11 Jason Merrill <jason@redhat.com> + + PR c++/22434 + PR c++/61288 + * call.c (build_conditional_expr_1): Avoid reading freed memory. + 2014-07-11 Paolo Carlini <paolo.carlini@oracle.com> PR c++/53159 diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 46e5186..4ca6be5 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -4763,6 +4763,7 @@ build_conditional_expr_1 (location_t loc, tree arg1, tree arg2, tree arg3, { conversion *conv2; conversion *conv3; + bool converted = false; /* Get the high-water mark for the CONVERSION_OBSTACK. */ p = conversion_obstack_alloc (0); @@ -4809,6 +4810,7 @@ build_conditional_expr_1 (location_t loc, tree arg1, tree arg2, tree arg3, converted to X, the conversion will fail. */ if (error_operand_p (arg2)) result = error_mark_node; + converted = true; } else if (conv3 && !conv3->bad_p) { @@ -4817,6 +4819,7 @@ build_conditional_expr_1 (location_t loc, tree arg1, tree arg2, tree arg3, arg3_type = TREE_TYPE (arg3); if (error_operand_p (arg3)) result = error_mark_node; + converted = true; } /* Free all the conversions we allocated. */ @@ -4840,8 +4843,7 @@ build_conditional_expr_1 (location_t loc, tree arg1, tree arg2, tree arg3, conditional expression failing altogether, even though, according to this step, the one operand could be converted to the type of the other. */ - if (((conv2 && !conv2->bad_p) - || (conv3 && !conv3->bad_p)) + if (converted && CLASS_TYPE_P (arg2_type) && cp_type_quals (arg2_type) != cp_type_quals (arg3_type)) arg2_type = arg3_type = |