summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>2003-03-13 21:39:38 +0000
committerjason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>2003-03-13 21:39:38 +0000
commit868c5d6e42b19140ea45b2e2996c4d94297ff026 (patch)
treedddf13ebd2bb68fb674c933e1ce0f2778324f96a
parent2addbfadb57f6d5906d268f5df97524812b0c827 (diff)
downloadppe42-gcc-868c5d6e42b19140ea45b2e2996c4d94297ff026.tar.gz
ppe42-gcc-868c5d6e42b19140ea45b2e2996c4d94297ff026.zip
PR c++/9420
* search.c (lookup_conversions): Call complete_type here. * call.c (implicit_conversion): Not here. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@64332 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/call.c5
-rw-r--r--gcc/cp/search.c4
3 files changed, 8 insertions, 7 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 29166882d5f..539ad19f999 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2003-03-13 Jason Merrill <jason@redhat.com>
+
+ PR c++/9420
+ * search.c (lookup_conversions): Call complete_type here.
+ * call.c (implicit_conversion): Not here.
+
2003-03-13 Mark Mitchell <mark@codesourcery.com>
* decl2.c (do_nonmember_using_decl): Correct handling of
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index d6496ad6a90..9ed804b439d 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -1305,11 +1305,6 @@ implicit_conversion (tree to, tree from, tree expr, int flags)
|| expr == error_mark_node)
return NULL_TREE;
- /* Make sure both the FROM and TO types are complete so that
- user-defined conversions are available. */
- complete_type (from);
- complete_type (to);
-
if (TREE_CODE (to) == REFERENCE_TYPE)
conv = reference_binding (to, from, expr, flags);
else
diff --git a/gcc/cp/search.c b/gcc/cp/search.c
index 3d23766d152..7cc1fa1d929 100644
--- a/gcc/cp/search.c
+++ b/gcc/cp/search.c
@@ -2271,8 +2271,8 @@ lookup_conversions (tree type)
tree t;
tree conversions = NULL_TREE;
- if (COMPLETE_TYPE_P (type))
- bfs_walk (TYPE_BINFO (type), add_conversions, 0, &conversions);
+ complete_type (type);
+ bfs_walk (TYPE_BINFO (type), add_conversions, 0, &conversions);
for (t = conversions; t; t = TREE_CHAIN (t))
IDENTIFIER_MARKED (DECL_NAME (OVL_CURRENT (TREE_VALUE (t)))) = 0;
OpenPOWER on IntegriCloud