--- gcc/dwarf2out.c.jj 2011-03-23 09:34:39.000000000 +0100 +++ gcc/dwarf2out.c 2011-03-23 13:04:37.000000000 +0100 @@ -4291,6 +4291,7 @@ dwarf2out_note_section_used (void) void dwarf2out_switch_text_section (void) { + section *sect; dw_fde_ref fde = current_fde (); gcc_assert (cfun && fde && !fde->dw_fde_switched_sections); @@ -4316,7 +4317,13 @@ dwarf2out_switch_text_section (void) fprintf (asm_out_file, "\t.cfi_endproc\n"); /* Now do the real section switch. */ - switch_to_section (current_function_section ()); + sect = current_function_section (); + switch_to_section (sect); + + if (fde->dw_fde_switched_cold_to_hot) + fde->in_std_section + = (sect == text_section + || (cold_text_section && sect == cold_text_section)); if (dwarf2out_do_cfi_asm ()) { @@ -6212,19 +6219,6 @@ static GTY (()) VEC (pubname_entry, gc) defines/undefines (and file start/end markers). */ static GTY (()) VEC (macinfo_entry, gc) * macinfo_table; -/* Array of dies for which we should generate .debug_arange info. */ -static GTY((length ("arange_table_allocated"))) dw_die_ref *arange_table; - -/* Number of elements currently allocated for arange_table. */ -static GTY(()) unsigned arange_table_allocated; - -/* Number of elements in arange_table currently in use. */ -static GTY(()) unsigned arange_table_in_use; - -/* Size (in elements) of increments by which we may expand the - arange_table. */ -#define ARANGE_TABLE_INCREMENT 64 - /* Array of dies for which we should generate .debug_ranges info. */ static GTY ((length ("ranges_table_allocated"))) dw_ranges_ref ranges_table; @@ -6432,8 +6426,7 @@ static void add_pubname (tree, dw_die_re static void add_pubname_string (const char *, dw_die_ref); static void add_pubtype (tree, dw_die_ref); static void output_pubnames (VEC (pubname_entry,gc) *); -static void add_arange (tree, dw_die_ref); -static void output_aranges (void); +static void output_aranges (unsigned long); static unsigned int add_ranges_num (int); static unsigned int add_ranges (const_tree); static void add_ranges_by_labels (dw_die_ref, const char *, const char *, @@ -10881,7 +10874,20 @@ size_of_aranges (void) size += 2 * DWARF2_ADDR_SIZE; if (cold_text_section_used) size += 2 * DWARF2_ADDR_SIZE; - size += 2 * DWARF2_ADDR_SIZE * arange_table_in_use; + if (have_multiple_function_sections) + { + unsigned fde_idx = 0; + + for (fde_idx = 0; fde_idx < fde_table_in_use; fde_idx++) + { + dw_fde_ref fde = &fde_table[fde_idx]; + + if (!fde->in_std_section) + size += 2 * DWARF2_ADDR_SIZE; + if (fde->dw_fde_switched_sections && !fde->cold_in_std_section) + size += 2 * DWARF2_ADDR_SIZE; + } + } /* Count the two zero words used to terminated the address range table. */ size += 2 * DWARF2_ADDR_SIZE; @@ -11709,35 +11715,14 @@ output_pubnames (VEC (pubname_entry, gc) dw2_asm_output_data (DWARF_OFFSET_SIZE, 0, NULL); } -/* Add a new entry to .debug_aranges if appropriate. */ - -static void -add_arange (tree decl, dw_die_ref die) -{ - if (! DECL_SECTION_NAME (decl)) - return; - - if (arange_table_in_use == arange_table_allocated) - { - arange_table_allocated += ARANGE_TABLE_INCREMENT; - arange_table = GGC_RESIZEVEC (dw_die_ref, arange_table, - arange_table_allocated); - memset (arange_table + arange_table_in_use, 0, - ARANGE_TABLE_INCREMENT * sizeof (dw_die_ref)); - } - - arange_table[arange_table_in_use++] = die; -} - /* Output the information that goes into the .debug_aranges table. Namely, define the beginning and ending address range of the text section generated for this compilation unit. */ static void -output_aranges (void) +output_aranges (unsigned long aranges_length) { unsigned i; - unsigned long aranges_length = size_of_aranges (); if (DWARF_INITIAL_LENGTH_SIZE - DWARF_OFFSET_SIZE == 4) dw2_asm_output_data (4, 0xffffffff, @@ -11782,38 +11767,44 @@ output_aranges (void) cold_text_section_label, "Length"); } - for (i = 0; i < arange_table_in_use; i++) + if (have_multiple_function_sections) { - dw_die_ref die = arange_table[i]; - - /* We shouldn't see aranges for DIEs outside of the main CU. */ - gcc_assert (die->die_mark); + unsigned fde_idx = 0; - if (die->die_tag == DW_TAG_subprogram) - { - dw2_asm_output_addr (DWARF2_ADDR_SIZE, get_AT_low_pc (die), - "Address"); - dw2_asm_output_delta (DWARF2_ADDR_SIZE, get_AT_hi_pc (die), - get_AT_low_pc (die), "Length"); - } - else + for (fde_idx = 0; fde_idx < fde_table_in_use; fde_idx++) { - /* A static variable; extract the symbol from DW_AT_location. - Note that this code isn't currently hit, as we only emit - aranges for functions (jason 9/23/99). */ - dw_attr_ref a = get_AT (die, DW_AT_location); - dw_loc_descr_ref loc; - - gcc_assert (a && AT_class (a) == dw_val_class_loc); - - loc = AT_loc (a); - gcc_assert (loc->dw_loc_opc == DW_OP_addr); - - dw2_asm_output_addr_rtx (DWARF2_ADDR_SIZE, - loc->dw_loc_oprnd1.v.val_addr, "Address"); - dw2_asm_output_data (DWARF2_ADDR_SIZE, - get_AT_unsigned (die, DW_AT_byte_size), - "Length"); + dw_fde_ref fde = &fde_table[fde_idx]; + + if (fde->dw_fde_switched_sections) + { + if (!fde->in_std_section) + { + dw2_asm_output_addr (DWARF2_ADDR_SIZE, + fde->dw_fde_hot_section_label, + "Address"); + dw2_asm_output_delta (DWARF2_ADDR_SIZE, + fde->dw_fde_hot_section_end_label, + fde->dw_fde_hot_section_label, + "Length"); + } + if (!fde->cold_in_std_section) + { + dw2_asm_output_addr (DWARF2_ADDR_SIZE, + fde->dw_fde_unlikely_section_label, + "Address"); + dw2_asm_output_delta (DWARF2_ADDR_SIZE, + fde->dw_fde_unlikely_section_end_label, + fde->dw_fde_unlikely_section_label, + "Length"); + } + } + else if (!fde->in_std_section) + { + dw2_asm_output_addr (DWARF2_ADDR_SIZE, fde->dw_fde_begin, + "Address"); + dw2_asm_output_delta (DWARF2_ADDR_SIZE, fde->dw_fde_end, + fde->dw_fde_begin, "Length"); + } } } @@ -19193,7 +19184,6 @@ gen_subprogram_die (tree decl, dw_die_re #endif add_pubname (decl, subr_die); - add_arange (decl, subr_die); } else { /* Generate pubnames entries for the split function code @@ -19209,7 +19199,7 @@ gen_subprogram_die (tree decl, dw_die_re section, since the HOT/COLD labels might precede an alignment offset. */ bool range_list_added = false; - if (fde->in_std_section) + if (!fde->dw_fde_switched_cold_to_hot) { add_ranges_by_labels (subr_die, fde->dw_fde_begin, @@ -19255,7 +19245,6 @@ gen_subprogram_die (tree decl, dw_die_re fde->dw_fde_end); /* Add it. */ add_pubname (decl, subr_die); - add_arange (decl, subr_die); /* Build a minimal DIE for the secondary section. */ seg_die = new_die (DW_TAG_subprogram, @@ -19278,7 +19267,7 @@ gen_subprogram_die (tree decl, dw_die_re if (DECL_ARTIFICIAL (decl)) add_AT_flag (seg_die, DW_AT_artificial, 1); - if (fde->in_std_section) + if (!fde->dw_fde_switched_cold_to_hot) { name = concat ("__cold_sect_of_", name, NULL); add_AT_lbl_id (seg_die, DW_AT_low_pc, @@ -19296,7 +19285,6 @@ gen_subprogram_die (tree decl, dw_die_re } add_name_attribute (seg_die, name); add_pubname_string (name, seg_die); - add_arange (decl, seg_die); } } else @@ -19304,7 +19292,6 @@ gen_subprogram_die (tree decl, dw_die_re add_AT_lbl_id (subr_die, DW_AT_low_pc, fde->dw_fde_begin); add_AT_lbl_id (subr_die, DW_AT_high_pc, fde->dw_fde_end); add_pubname (decl, subr_die); - add_arange (decl, subr_die); } } @@ -22041,7 +22028,7 @@ dwarf2out_begin_function (tree fun) { if (function_section (fun) != text_section) have_multiple_function_sections = true; - else if (flag_reorder_blocks_and_partition && !cold_text_section) + if (flag_reorder_blocks_and_partition && !cold_text_section) { gcc_assert (current_function_decl == fun); cold_text_section = unlikely_text_section (); @@ -22751,11 +22738,9 @@ prune_unused_types (void) } /* Also set the mark on nodes referenced from the - pubname_table or arange_table. */ + pubname_table. */ FOR_EACH_VEC_ELT (pubname_entry, pubname_table, i, pub) prune_unused_types_mark (pub->die, 1); - for (i = 0; i < arange_table_in_use; i++) - prune_unused_types_mark (arange_table[i], 1); /* Get rid of nodes that aren't marked; and update the string counts. */ if (debug_str_hash && debug_str_hash_forced) @@ -23553,7 +23538,7 @@ dwarf2out_finish (const char *filename) if (text_section_used) add_ranges_by_labels (comp_unit_die (), text_section_label, text_end_label, &range_list_added); - if (flag_reorder_blocks_and_partition && cold_text_section_used) + if (cold_text_section_used) add_ranges_by_labels (comp_unit_die (), cold_text_section_label, cold_end_label, &range_list_added); @@ -23676,13 +23661,21 @@ dwarf2out_finish (const char *filename) } } - /* Output the address range information. We only put functions in the arange - table, so don't write it out if we don't have any. */ - if ((text_section_used || cold_text_section_used || arange_table_in_use) - && info_section_emitted) - { - switch_to_section (debug_aranges_section); - output_aranges (); + /* Output the address range information. We only put functions in the + arange table, so don't write it out if we don't have any. */ + if (info_section_emitted) + { + unsigned long aranges_length = size_of_aranges (); + + /* Empty .debug_aranges would contain just header and + terminating 0,0. */ + if (aranges_length + != (unsigned long) (DWARF_ARANGES_HEADER_SIZE + + 2 * DWARF2_ADDR_SIZE)) + { + switch_to_section (debug_aranges_section); + output_aranges (aranges_length); + } } /* Output ranges section if necessary. */