dwarf2out.c (gen_subprogram_die): Fixup die_parent for the abstract instance of…

dwarf2out.c (gen_subprogram_die): Fixup die_parent for the abstract instance of a nested inline function.

        * dwarf2out.c (gen_subprogram_die): Fixup die_parent for the
        abstract instance of a nested inline function.

        * stor-layout.c (finish_record_layout): finalize_type_size
        before laying out the pending_statics.

From-SVN: r33820

gcc/ChangeLog

+2000-05-10  Jason Merrill  <jason@casey.cygnus.com>
+
+	* dwarf2out.c (gen_subprogram_die): Fixup die_parent for the
+	abstract instance of a nested inline function.
+
+	* stor-layout.c (finish_record_layout): finalize_type_size
+	before laying out the pending_statics.
+
 Wed 10 May 09:36:47 2000  Neil Booth  <NeilB@earthling.net>
 
 	* cpplex.c (spell_token): New function.

gcc/dwarf2out.c

@@ -8160,6 +8160,11 @@ gen_subprogram_die (decl, context_die)
       if (declaration && ! local_scope_p (context_die))
 	abort ();
 
+      /* Fixup die_parent for the abstract instance of a nested
+	 inline function.  */
+      if (old_die && old_die->die_parent == NULL)
+	add_child_die (context_die, old_die);
+
       subr_die = new_die (DW_TAG_subprogram, context_die);
       add_abstract_origin_attribute (subr_die, origin);
     }

gcc/stor-layout.c

@@ -1162,6 +1162,9 @@ finish_record_layout (rli)
   /* Compute the TYPE_MODE for the record.  */
   compute_record_mode (rli->t);
 
+  /* Perform any last tweaks to the TYPE_SIZE, etc.  */
+  finalize_type_size (rli->t);
+
   /* Lay out any static members.  This is done now because their type
      may use the record's type.  */
   while (rli->pending_statics)
@@ -1170,9 +1173,6 @@ finish_record_layout (rli)
       rli->pending_statics = TREE_CHAIN (rli->pending_statics);
     }
 
-  /* Perform any last tweaks to the TYPE_SIZE, etc.  */
-  finalize_type_size (rli->t);
-
   /* Clean up.  */
   free (rli);
 }