From 2dbfb4181cac4d7da8fa16a00139c432cce6de62 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Fri, 13 Feb 1998 01:37:30 +0000 Subject: [PATCH] * call.c (standard_conversion): A BASE_CONV replaces an RVALUE_CONV. From-SVN: r17898 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/call.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 70186da7408..0054db6cf61 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +Fri Feb 13 01:36:42 1998 Jason Merrill + + * call.c (standard_conversion): A BASE_CONV replaces an RVALUE_CONV. + Fri Feb 13 00:21:59 1998 Jason Merrill * cp-tree.h: Add access_protected_virtual_node. diff --git a/gcc/cp/call.c b/gcc/cp/call.c index d30092eff9a..299e0a4257e 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -3212,7 +3212,11 @@ standard_conversion (to, from, expr) } else if (IS_AGGR_TYPE (to) && IS_AGGR_TYPE (from) && DERIVED_FROM_P (to, from)) - conv = build_conv (BASE_CONV, to, conv); + { + if (TREE_CODE (conv) == RVALUE_CONV) + conv = TREE_OPERAND (conv, 0); + conv = build_conv (BASE_CONV, to, conv); + } else return 0; -- 2.30.2