From 702f9fe53516f574c149d7638b977d84b2861e9b Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Thu, 7 Feb 2013 11:32:28 -0500
Subject: [PATCH] =?UTF-8?q?re=20PR=20c++/56235=20(Bogus=20"error:=20invali?=
 =?UTF-8?q?d=20conversion=20from=20=E2=80=98unsigned=20char=E2=80=99=20to?=
 =?UTF-8?q?=20=E2=80=98B::Mode=E2=80=99=20[-fpermissive]")?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

	PR c++/56235
	* method.c (do_build_copy_constructor): Don't bother turning
	scalars from lvalues to xvalues.
	(do_build_copy_assign): Likewise.

From-SVN: r195854
---
 gcc/cp/ChangeLog                      |  7 +++++++
 gcc/cp/method.c                       |  8 ++++++--
 gcc/testsuite/g++.dg/init/bitfield4.C | 24 ++++++++++++++++++++++++
 3 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/init/bitfield4.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f60735d61659..9665be4dfc71 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2013-02-07  Jason Merrill  <jason@redhat.com>
+
+	PR c++/56235
+	* method.c (do_build_copy_constructor): Don't bother turning
+	scalars from lvalues to xvalues.
+	(do_build_copy_assign): Likewise.
+
 2013-02-06  Jason Merrill  <jason@redhat.com>
 
 	* parser.c (cp_parser_enum_specifier): Check for error_mark_node.
diff --git a/gcc/cp/method.c b/gcc/cp/method.c
index d13a0cf3a9ee..a1bab95049ca 100644
--- a/gcc/cp/method.c
+++ b/gcc/cp/method.c
@@ -610,7 +610,9 @@ do_build_copy_constructor (tree fndecl)
 	    }
 
 	  init = build3 (COMPONENT_REF, expr_type, parm, field, NULL_TREE);
-	  if (move_p && TREE_CODE (expr_type) != REFERENCE_TYPE)
+	  if (move_p && TREE_CODE (expr_type) != REFERENCE_TYPE
+	      /* 'move' breaks bit-fields, and has no effect for scalars.  */
+	      && !scalarish_type_p (expr_type))
 	    init = move (init);
 	  init = build_tree_list (NULL_TREE, init);
 
@@ -724,7 +726,9 @@ do_build_copy_assign (tree fndecl)
 	  expr_type = cp_build_qualified_type (expr_type, quals);
 
 	  init = build3 (COMPONENT_REF, expr_type, init, field, NULL_TREE);
-	  if (move_p && TREE_CODE (expr_type) != REFERENCE_TYPE)
+	  if (move_p && TREE_CODE (expr_type) != REFERENCE_TYPE
+	      /* 'move' breaks bit-fields, and has no effect for scalars.  */
+	      && !scalarish_type_p (expr_type))
 	    init = move (init);
 
 	  if (DECL_NAME (field))
diff --git a/gcc/testsuite/g++.dg/init/bitfield4.C b/gcc/testsuite/g++.dg/init/bitfield4.C
new file mode 100644
index 000000000000..30041c435999
--- /dev/null
+++ b/gcc/testsuite/g++.dg/init/bitfield4.C
@@ -0,0 +1,24 @@
+// PR c++/56235
+
+struct A
+{
+  A (const A &);
+};
+
+struct B
+{
+  A a;
+  enum Mode { };
+  Mode m:8;
+};
+
+struct C
+{
+  C();
+  B b;
+};
+
+C fn()
+{
+  return C();
+}