* call.c (standard_conversion): A BASE_CONV replaces an RVALUE_CONV.

From-SVN: r17898

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 70186da..0054db6 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+Fri Feb 13 01:36:42 1998  Jason Merrill  <jason@yorick.cygnus.com>
+
+       * call.c (standard_conversion): A BASE_CONV replaces an RVALUE_CONV.
+
 Fri Feb 13 00:21:59 1998  Jason Merrill  <jason@yorick.cygnus.com>
 
        * cp-tree.h: Add access_protected_virtual_node.

diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index d30092e..299e0a4 100644 (file)
--- 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;