59th Cygnus<->FSF merge

[gcc.git] / gcc / cp / init.c

diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index 01c5bcb896a3140d4b49470140a71cd7307c042c..37376131d8c1cf5756e2f46a53a8d8c1009128c6 100644 (file)
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -571,7 +571,7 @@ emit_base_init (t, immediately)
 
       if (init != void_list_node)
        {
-         member = convert_pointer_to (base_binfo, current_class_decl);
+         member = convert_pointer_to_real (base_binfo, current_class_decl);
          expand_aggr_init_1 (base_binfo, 0,
                              build_indirect_ref (member, NULL_PTR), init,
                              BINFO_OFFSET_ZEROP (base_binfo), LOOKUP_NORMAL);
@@ -1980,6 +1980,10 @@ build_offset_ref (cname, name)
              && ((flag_save_memoized_contexts && global_bindings_p ())
                  || ! allocation_temporary_p ()))
            fnfields = copy_list (fnfields);
+
+         for (t = TREE_VALUE (fnfields); t; t = DECL_CHAIN (t))
+           assemble_external (t);
+
          t = build_tree_list (error_mark_node, fnfields);
          TREE_TYPE (t) = build_offset_type (type, unknown_type_node);
          return t;