diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/cvt.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/parse/stmtexpr2.C | 11 |
4 files changed, 23 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 39b60eb..e4ca059 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2002-04-24 Mark Mitchell <mark@codesourcery.com> + + PR c++/6438. + * cvt.c (convert_to_void): Don't unconditionally make COND_EXPRs + void. + 2002-04-24 Neil Booth <neil@daikokuya.demon.co.uk> * cp-lang.c (LANG_HOOKS_COMMON_ATTRIBUTE_TABLE, diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c index d0f9945..b5306c1 100644 --- a/gcc/cp/cvt.c +++ b/gcc/cp/cvt.c @@ -836,7 +836,7 @@ convert_to_void (expr, implicit) tree new_op1 = convert_to_void (op1, implicit); tree new_op2 = convert_to_void (op2, implicit); - expr = build (COND_EXPR, void_type_node, + expr = build (COND_EXPR, TREE_TYPE (new_op1), TREE_OPERAND (expr, 0), new_op1, new_op2); break; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 9589e8a..a99b232 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2002-04-24 Mark Mitchell <mark@codesourcery.com> + + PR c++/6438. + * g++.dg/parse/stmtexpr2.C: New test. + Wed Apr 24 21:38:36 2002 J"orn Rennecke <joern.rennecke@superh.com> * gcc.dg/20020312-2.c: Add SH target. diff --git a/gcc/testsuite/g++.dg/parse/stmtexpr2.C b/gcc/testsuite/g++.dg/parse/stmtexpr2.C new file mode 100644 index 0000000..44f7f85 --- /dev/null +++ b/gcc/testsuite/g++.dg/parse/stmtexpr2.C @@ -0,0 +1,11 @@ +// { dg-do compile } +// { dg-options "" } + +#define DMAX(a,b) ({double _a = (a), _b = (b); _a > _b ? _a : _b; }) + +void foo(void) +{ + double xl, dy; + xl = DMAX(dy, 0.0); +} + |