summaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorjason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>2011-08-05 19:12:24 +0000
committerjason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>2011-08-05 19:12:24 +0000
commitf6878ed0b08f9e3031e0b3a697dcaa5cf24dd331 (patch)
tree7ad801059dd0d31d7edf24ad948cdebdd40853b5 /gcc
parent14cb05a23b22519677b7f02cea1ab4b3cc6b84ab (diff)
downloadgcc-f6878ed0b08f9e3031e0b3a697dcaa5cf24dd331.tar.gz
PR c++/49812
* typeck.c (cp_build_unary_op) [POSTINCREMENT_EXPR]: Strip cv-quals. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@177479 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog3
-rw-r--r--gcc/cp/typeck.c3
-rw-r--r--gcc/testsuite/ChangeLog3
-rw-r--r--gcc/testsuite/g++.dg/overload/rvalue2.C11
4 files changed, 20 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index d7ad9929c93..46eee7e8dbd 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 ab08eae2859..f53deb985a6 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 4956e57e777..6ba618327be 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 00000000000..8a2290dc293
--- /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++);
+}