diff options
Diffstat (limited to 'gcc/dwarfout.c')
| -rw-r--r-- | gcc/dwarfout.c | 78 |
1 files changed, 74 insertions, 4 deletions
diff --git a/gcc/dwarfout.c b/gcc/dwarfout.c index ac17f7fb196..0a30a9775cf 100644 --- a/gcc/dwarfout.c +++ b/gcc/dwarfout.c @@ -270,6 +270,22 @@ static unsigned pending_types; #define PENDING_TYPES_INCREMENT 64 +/* A pointer to the base of a list of incomplete types which might be + completed at some later time. */ + +static tree *incomplete_types_list; + +/* Number of elements currently allocated for the incomplete_types_list. */ +static unsigned incomplete_types_allocated; + +/* Number of elements of incomplete_types_list currently in use. */ +static unsigned incomplete_types; + +/* Size (in elements) of increments by which we may expand the incomplete + types list. Actually, a single hunk of space of this size should + be enough for most typical programs. */ +#define INCOMPLETE_TYPES_INCREMENT 64 + /* Pointer to an artificial RECORD_TYPE which we create in dwarfout_init. This is used in a hack to help us get the DIEs describing types of formal parameters to come *after* all of the DIEs describing the formal @@ -2090,8 +2106,16 @@ field_byte_offset (decl) negative. Gdb fails when given negative bit offsets. We avoid this by recomputing using the first bit of the bitfield. This will give us an object which does not completely contain the bitfield, but it - will be aligned, and it will contain the first bit of the bitfield. */ - if (object_offset_in_bits > bitpos_int) + will be aligned, and it will contain the first bit of the bitfield. + + However, only do this for a BYTES_BIG_ENDIAN target. For a + ! BYTES_BIG_ENDIAN target, bitpos_int + field_size_in_bits is the first + first bit of the bitfield. If we recompute using bitpos_int + 1 below, + then we end up computing the object byte offset for the wrong word of the + desired bitfield, which in turn causes the field offset to be negative + in bit_offset_attribute. */ + if (BYTES_BIG_ENDIAN + && object_offset_in_bits > bitpos_int) { deepest_bitpos = bitpos_int + 1; object_offset_in_bits @@ -4216,6 +4240,40 @@ output_pending_types_for_scope (containing_scope) } } +/* Remember a type in the incomplete_types_list. */ + +static void +add_incomplete_type (type) + tree type; +{ + if (incomplete_types == incomplete_types_allocated) + { + incomplete_types_allocated += INCOMPLETE_TYPES_INCREMENT; + incomplete_types_list + = (tree *) xrealloc (incomplete_types_list, + sizeof (tree) * incomplete_types_allocated); + } + + incomplete_types_list[incomplete_types++] = type; +} + +/* Walk through the list of incomplete types again, trying once more to + emit full debugging info for them. */ + +static void +retry_incomplete_types () +{ + register tree type; + + finalizing = 1; + while (incomplete_types) + { + --incomplete_types; + type = incomplete_types_list[incomplete_types]; + output_type (type, NULL_TREE); + } +} + static void output_type (type, containing_scope) register tree type; @@ -4380,7 +4438,13 @@ output_type (type, containing_scope) && TREE_CODE (TYPE_CONTEXT (type)) != FUNCTION_TYPE && TREE_CODE (TYPE_CONTEXT (type)) != METHOD_TYPE)) && !finalizing) - return; /* EARLY EXIT! Avoid setting TREE_ASM_WRITTEN. */ + { + /* We can't do this for function-local types, and we don't need + to. */ + if (TREE_PERMANENT (type)) + add_incomplete_type (type); + return; /* EARLY EXIT! Avoid setting TREE_ASM_WRITTEN. */ + } /* Prevent infinite recursion in cases where the type of some member of this type is expressed in terms of this type itself. */ @@ -4435,7 +4499,11 @@ output_type (type, containing_scope) register int i; for (i = 0; i < n_bases; i++) - output_die (output_inheritance_die, TREE_VEC_ELT (bases, i)); + { + tree binfo = TREE_VEC_ELT (bases, i); + output_type (BINFO_TYPE (binfo), containing_scope); + output_die (output_inheritance_die, binfo); + } } ++in_class; @@ -5844,6 +5912,8 @@ dwarfout_finish () { char label[MAX_ARTIFICIAL_LABEL_BYTES]; + retry_incomplete_types (); + fputc ('\n', asm_out_file); ASM_OUTPUT_PUSH_SECTION (asm_out_file, DEBUG_SECTION); |