From a5afbdd6559c8689424d5776e45cb77120730f43 Mon Sep 17 00:00:00 2001 From: Marek Polacek Date: Tue, 8 Aug 2017 08:55:43 +0000 Subject: [PATCH] re PR c++/81607 (Conditional operator: "type mismatch in shift expression" error) PR c++/81607 * cp-gimplify.c (cp_fold): If folding exposed a branch of a COND_EXPR, convert it to the original type of the COND_EXPR, if they differ. * g++.dg/other/bitfield6.C: New test. From-SVN: r250948 --- gcc/cp/ChangeLog | 7 +++++++ gcc/cp/cp-gimplify.c | 6 +++--- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/other/bitfield6.C | 9 +++++++++ 4 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/g++.dg/other/bitfield6.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 23f6a1d2a7a..93257293d1c 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2017-08-08 Marek Polacek + + PR c++/81607 + * cp-gimplify.c (cp_fold): If folding exposed a branch of + a COND_EXPR, convert it to the original type of the COND_EXPR, if + they differ. + 2017-08-08 Martin Liska * call.c: Include header files. diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c index 528e38816d3..4a52aa50e77 100644 --- a/gcc/cp/cp-gimplify.c +++ b/gcc/cp/cp-gimplify.c @@ -2316,9 +2316,9 @@ cp_fold (tree x) /* A COND_EXPR might have incompatible types in branches if one or both arms are bitfields. If folding exposed such a branch, fix it up. */ - if (TREE_CODE (x) != code) - if (tree type = is_bitfield_expr_with_lowered_type (x)) - x = fold_convert (type, x); + if (TREE_CODE (x) != code + && !useless_type_conversion_p (TREE_TYPE (org_x), TREE_TYPE (x))) + x = fold_convert (TREE_TYPE (org_x), x); break; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index c2119f478ba..e08c2e848f4 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-08-08 Marek Polacek + + PR c++/81607 + * g++.dg/other/bitfield6.C: New test. + 2017-08-07 Michael Meissner PR target/81593 diff --git a/gcc/testsuite/g++.dg/other/bitfield6.C b/gcc/testsuite/g++.dg/other/bitfield6.C new file mode 100644 index 00000000000..c1e8a17989b --- /dev/null +++ b/gcc/testsuite/g++.dg/other/bitfield6.C @@ -0,0 +1,9 @@ +// PR c++/81607 + +int a; + +struct b { + long c : 32; +} d; + +char f = (903092 ? int(d.c) : 0) << a; -- 2.30.2