diff options
| author | Jason Merrill <jason@redhat.com> | 2011-08-05 15:12:24 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2011-08-05 15:12:24 -0400 |
| commit | 9127e99420ca8f238f15c06fe7f9089e38ed862d (patch) | |
| tree | 7ad801059dd0d31d7edf24ad948cdebdd40853b5 | |
| parent | fcbc2bedbfb3a584bd98a7792d7d088db8e8c6fd (diff) | |
| download | gcc-9127e99420ca8f238f15c06fe7f9089e38ed862d.zip gcc-9127e99420ca8f238f15c06fe7f9089e38ed862d.tar.gz gcc-9127e99420ca8f238f15c06fe7f9089e38ed862d.tar.bz2 | |
re PR c++/49812 (strange return type for built-in operator++(int, int))
PR c++/49812
* typeck.c (cp_build_unary_op) [POSTINCREMENT_EXPR]: Strip cv-quals.
From-SVN: r177479
| -rw-r--r-- | gcc/cp/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/cp/typeck.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/overload/rvalue2.C | 11 |
4 files changed, 20 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index d7ad992..46eee7e 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 2011-08-05 Jason Merrill <jason@redhat.com> + PR c++/49812 + * typeck.c (cp_build_unary_op) [POSTINCREMENT_EXPR]: Strip cv-quals. + PR c++/49983 * parser.c (cp_parser_range_for): Only do auto deduction in template if the range is non-dependent. diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index ab08eae..f53deb9 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -5220,6 +5220,9 @@ cp_build_unary_op (enum tree_code code, tree xarg, int noconvert, } val = boolean_increment (code, arg); } + else if (code == POSTINCREMENT_EXPR || code == POSTDECREMENT_EXPR) + /* An rvalue has no cv-qualifiers. */ + val = build2 (code, cv_unqualified (TREE_TYPE (arg)), arg, inc); else val = build2 (code, TREE_TYPE (arg), arg, inc); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 4956e57..6ba6183 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2011-08-05 Jason Merrill <jason@redhat.com> + PR c++/49812 + * g++.dg/overload/rvalue2.C: New. + PR c++/49983 * g++.dg/cpp0x/range-for21.C: New. diff --git a/gcc/testsuite/g++.dg/overload/rvalue2.C b/gcc/testsuite/g++.dg/overload/rvalue2.C new file mode 100644 index 0000000..8a2290d --- /dev/null +++ b/gcc/testsuite/g++.dg/overload/rvalue2.C @@ -0,0 +1,11 @@ +// PR c++/49812 +// The call should choose the second f because i++ is an int rvalue. + +template <class T> void f(const volatile T& t) { t.i; } +template <class T> void f(const T&); + +int main() +{ + volatile int i = 0; + f(i++); +} |