re PR c++/47132 ([C++0x] decltype can't deduce some operator return types when defini...

	PR c++/47132
	* mangle.c (write_expression): Handle MODOP_EXPR.

From-SVN: r174357

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 7a579c6d004e4f911678e320ef1c8ba3c7af7c90..9ccdee5a178a586a4b1e01f85222a09be9a836a3 100644 (file)
--- 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 c1f3b44e9053258e3a8d16615e3186b59ca50dfa..27ef374597eddb2c33786cc6d2cf17ed4a907bec 100644 (file)
--- 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 a9e31ce77fc103794982a803795b029eab0cfdbd..4c97a9f07dfa9f3047dc102552e43afb3d2f0e49 100644 (file)
--- 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 (file)
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);
+}