From: Dodji Seketeli <dodji@redhat.com>
Date: Mon, 18 Jan 2010 19:11:24 +0000 (+0000)
Subject: re PR c++/42766 (tree check fail in build_expr_type_conversion)
X-Git-Tag: releases/gcc-4.5.0~1158
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a5cf630e39611a1e7461aa0d17bed196f60bd710;p=thirdparty%2Fgcc.git

re PR c++/42766 (tree check fail in build_expr_type_conversion)

Fix PR c++/42766

gcc/cp/ChangeLog:
	PR c++/42766
	* cvt.c (build_expr_type_conversion): Look through OVERLOAD.

gcc/testsuite/ChangeLog:
	PR c++/42766
	* g++.dg/conversion/op6.C: New test.

From-SVN: r156020
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index ffa7b86dd319..ccb2afec9e45 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-18  Dodji Seketeli  <dodji@redhat.com>
+
+	PR c++/42766
+	* cvt.c (build_expr_type_conversion): Look through OVERLOAD.
+
 2010-01-17  Dodji Seketeli  <dodji@redhat.com>
 
 	PR c++/42697
diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c
index b4cc2b3ed8ce..cbe85965a59d 100644
--- a/gcc/cp/cvt.c
+++ b/gcc/cp/cvt.c
@@ -1203,6 +1203,7 @@ build_expr_type_conversion (int desires, tree expr, bool complain)
       int win = 0;
       tree candidate;
       tree cand = TREE_VALUE (conv);
+      cand = OVL_CURRENT (cand);
 
       if (winner && winner == cand)
 	continue;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2b0d96d794ab..11a7540f5719 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-18  Dodji Seketeli  <dodji@redhat.com>
+
+	PR c++/42766
+	* g++.dg/conversion/op6.C: New test.
+
 2010-01-18  Uros Bizjak  <ubizjak@gmail.com>
 
 	PR target/42774
diff --git a/gcc/testsuite/g++.dg/conversion/op6.C b/gcc/testsuite/g++.dg/conversion/op6.C
new file mode 100644
index 000000000000..9aec9f0a8086
--- /dev/null
+++ b/gcc/testsuite/g++.dg/conversion/op6.C
@@ -0,0 +1,18 @@
+// Origin: PR c++/42766
+// { dg-do compile }
+
+template<class T> class smart_pointer {
+public:
+    operator T* () const { }
+    operator bool () const { }
+    operator bool () { }
+};
+class Context { };
+typedef smart_pointer<Context> ContextP;
+class SvnClient  {
+    ~SvnClient();
+    ContextP svnContext;
+};
+SvnClient::~SvnClient() {
+    delete svnContext;
+}