From: Mark Mitchell <mark@codesourcery.com>
Date: Fri, 16 Jan 2004 16:59:30 +0000 (+0000)
Subject: re PR c++/13478 (gcc uses wrong constructor to initialize a const reference)
X-Git-Tag: releases/gcc-3.4.0~909
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ab8ffc795c01db35bc620c7f22a2c5236ba958c2;p=thirdparty%2Fgcc.git

re PR c++/13478 (gcc uses wrong constructor to initialize a const reference)

	PR c++/13478
	* call.c (convert_like_real): Do not perform an additional
	direct-initialization when binding to a reference.

	PR c++/13478
	* g++.dg/init/ref10.C: New test.

From-SVN: r75979
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a902c255768c..3c41c9a2585d 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-16  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/13478
+	* call.c (convert_like_real): Do not perform an additional
+	direct-initialization when binding to a reference.
+
 2004-01-15  Giovanni Bajo  <giovannibajo@gcc.gnu.org>
 
 	PR c++/13407
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 26ca4885f7db..74878fd5cdc6 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -4068,8 +4068,7 @@ convert_like_real (tree convs, tree expr, tree fn, int argnum, int inner,
 	   conversion, but is not considered during overload resolution.
 
 	   If the target is a class, that means call a ctor.  */
-	if (IS_AGGR_TYPE (totype)
-	    && (inner >= 0 || !lvalue_p (expr)))
+	if (IS_AGGR_TYPE (totype) && inner >= 0)
 	  {
 	    expr = (build_temp 
 		    (expr, totype, 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3136eda9d74c..a9f2858e2702 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-16  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/13478
+	* g++.dg/init/ref10.C: New test.
+
 2004-01-15  Giovanni Bajo  <giovannibajo@gcc.gnu.org>
 
 	PR c++/13407
diff --git a/gcc/testsuite/g++.dg/init/ref10.C b/gcc/testsuite/g++.dg/init/ref10.C
new file mode 100644
index 000000000000..73fd6de92dc0
--- /dev/null
+++ b/gcc/testsuite/g++.dg/init/ref10.C
@@ -0,0 +1,14 @@
+// PR c++/13478
+
+struct A {};
+struct B : protected A {
+    B() {};
+    B(const A& ) {};
+private:
+    B(const B& ) {};
+};
+
+void foo(const A* ap)
+{
+  const B& br = *ap;
+}