aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2011-05-27 15:32:30 -0400
committerJason Merrill <jason@gcc.gnu.org>2011-05-27 15:32:30 -0400
commita47d328ff345b05eb6fec4683ac04ac939064bfc (patch)
tree2b4f9850f7581c3bbc2098ad5355b9ce9b204929 /gcc
parent69cf9a1cfe034650e76a31ea6d98b92da0acf188 (diff)
downloadgcc-a47d328ff345b05eb6fec4683ac04ac939064bfc.zip
gcc-a47d328ff345b05eb6fec4683ac04ac939064bfc.tar.gz
gcc-a47d328ff345b05eb6fec4683ac04ac939064bfc.tar.bz2
re PR c++/47132 ([C++0x] decltype can't deduce some operator return types when defining an auto function's return)
PR c++/47132 * mangle.c (write_expression): Handle MODOP_EXPR. From-SVN: r174357
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog3
-rw-r--r--gcc/cp/mangle.c9
-rw-r--r--gcc/testsuite/ChangeLog2
-rw-r--r--gcc/testsuite/g++.dg/abi/mangle47.C11
4 files changed, 25 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 7a579c6..9ccdee5 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
2011-05-27 Jason Merrill <jason@redhat.com>
+ PR c++/47132
+ * mangle.c (write_expression): Handle MODOP_EXPR.
+
PR c++/47277
* parser.c (cp_parser_unqualified_id): Don't check
constructor_name_p for enums.
diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c
index c1f3b44..27ef374 100644
--- a/gcc/cp/mangle.c
+++ b/gcc/cp/mangle.c
@@ -2599,6 +2599,15 @@ write_expression (tree expr)
write_unqualified_id (fn);
write_template_args (TREE_OPERAND (expr, 1));
}
+ else if (TREE_CODE (expr) == MODOP_EXPR)
+ {
+ enum tree_code subop = TREE_CODE (TREE_OPERAND (expr, 1));
+ const char *name = (assignment_operator_name_info[(int) subop]
+ .mangled_name);
+ write_string (name);
+ write_expression (TREE_OPERAND (expr, 0));
+ write_expression (TREE_OPERAND (expr, 2));
+ }
else
{
int i, len;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a9e31ce7..4c97a9f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,7 @@
2011-05-27 Jason Merrill <jason@redhat.com>
+ * g++.dg/abi/mangle47.C: New.
+
PR c++/49176
* g++.dg/template/const5.C: New.
diff --git a/gcc/testsuite/g++.dg/abi/mangle47.C b/gcc/testsuite/g++.dg/abi/mangle47.C
new file mode 100644
index 0000000..2c1b636
--- /dev/null
+++ b/gcc/testsuite/g++.dg/abi/mangle47.C
@@ -0,0 +1,11 @@
+// PR c++/47132
+// { dg-options -std=c++0x }
+// { dg-final { scan-assembler "_Z1fIiEDToRfp_Li1EET_" } }
+
+template <typename T>
+auto f (T t) -> decltype(t |= 1);
+
+int main()
+{
+ f(1);
+}