procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bootstrap on !NO_IMPLICIT_EXTERN_C and ia32 targets

Browse source 
libcpp/

	* include/line-map.h (struct linemap_stats): Change the type of
	the members from size_t to long.
	* macro.c (macro_arg_token_iter_init): Unconditionally initialize
	iter->location_ptr.

gcc/c-family/

	* c-lex.c (fe_file_change): Use LINEMAP_SYSP when
	!NO_IMPLICIT_EXTERN_C.

gcc/
	* input.c (dump_line_table_statistics): Use long, not size_t.

From-SVN: r180124
This commit is contained in:
Dodji Seketeli 2011-10-18 08:44:49 +00:00 • committed by Dodji Seketeli
parent d5899fb5d3
commit d17687f6f0
8 changed files with 51 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gcc/ChangeLog
View file

@ -1,3 +1,8 @@
2011-10-18 Dodji Seketeli <dodji@redhat.com>
PR bootstrap/50760
* input.c (dump_line_table_statistics): Use long, not size_t.
2011-10-17 Eric Botcazou <ebotcazou@adacore.com>
* config/sparc/sparc.md (in_call_delay): Fix formatting issues.

6
gcc/c-family/ChangeLog
View file

@ -1,3 +1,9 @@
2011-10-18 Dodji Seketeli <dodji@redhat.com>
PR bootstrap/50760
* c-lex.c (fe_file_change): Use LINEMAP_SYSP when
!NO_IMPLICIT_EXTERN_C.
2011-10-15 Tom Tromey <tromey@redhat.com>
Dodji Seketeli <dodji@redhat.com>

4
gcc/c-family/c-lex.c
View file

@ -211,7 +211,7 @@ fe_file_change (const struct line_map *new_map)
#ifndef NO_IMPLICIT_EXTERN_C
if (c_header_level)
++c_header_level;
else if (new_map->sysp == 2)
else if (LINEMAP_SYSP (new_map) == 2)
{
c_header_level = 1;
++pending_lang_change;
@ -224,7 +224,7 @@ fe_file_change (const struct line_map *new_map)
#ifndef NO_IMPLICIT_EXTERN_C
if (c_header_level && --c_header_level == 0)
{
if (new_map->sysp == 2)
if (LINEMAP_SYSP (new_map) == 2)
warning (0, "badly nested C headers from preprocessor");
--pending_lang_change;
}

28
gcc/input.c
View file

@ -80,7 +80,7 @@ void
dump_line_table_statistics (void)
{
struct linemap_stats s;
size_t total_used_map_size,
long total_used_map_size,
macro_maps_size,
total_allocated_map_size;
@ -99,45 +99,45 @@ dump_line_table_statistics (void)
+ s.macro_maps_used_size
+ s.macro_maps_locations_size;
fprintf (stderr, "Number of expanded macros: %5lu\n",
fprintf (stderr, "Number of expanded macros: %5ld\n",
s.num_expanded_macros);
if (s.num_expanded_macros != 0)
fprintf (stderr, "Average number of tokens per macro expansion: %5lu\n",
fprintf (stderr, "Average number of tokens per macro expansion: %5ld\n",
s.num_macro_tokens / s.num_expanded_macros);
fprintf (stderr,
"\nLine Table allocations during the "
"compilation process\n");
fprintf (stderr, "Number of ordinary maps used: %5lu%c\n",
fprintf (stderr, "Number of ordinary maps used: %5ld%c\n",
SCALE (s.num_ordinary_maps_used),
STAT_LABEL (s.num_ordinary_maps_used));
fprintf (stderr, "Ordinary map used size: %5lu%c\n",
fprintf (stderr, "Ordinary map used size: %5ld%c\n",
SCALE (s.ordinary_maps_used_size),
STAT_LABEL (s.ordinary_maps_used_size));
fprintf (stderr, "Number of ordinary maps allocated: %5lu%c\n",
fprintf (stderr, "Number of ordinary maps allocated: %5ld%c\n",
SCALE (s.num_ordinary_maps_allocated),
STAT_LABEL (s.num_ordinary_maps_allocated));
fprintf (stderr, "Ordinary maps allocated size: %5lu%c\n",
fprintf (stderr, "Ordinary maps allocated size: %5ld%c\n",
SCALE (s.ordinary_maps_allocated_size),
STAT_LABEL (s.ordinary_maps_allocated_size));
fprintf (stderr, "Number of macro maps used: %5lu%c\n",
fprintf (stderr, "Number of macro maps used: %5ld%c\n",
SCALE (s.num_macro_maps_used),
STAT_LABEL (s.num_macro_maps_used));
fprintf (stderr, "Macro maps used size: %5lu%c\n",
fprintf (stderr, "Macro maps used size: %5ld%c\n",
SCALE (s.macro_maps_used_size),
STAT_LABEL (s.macro_maps_used_size));
fprintf (stderr, "Macro maps locations size: %5lu%c\n",
fprintf (stderr, "Macro maps locations size: %5ld%c\n",
SCALE (s.macro_maps_locations_size),
STAT_LABEL (s.macro_maps_locations_size));
fprintf (stderr, "Macro maps size: %5lu%c\n",
fprintf (stderr, "Macro maps size: %5ld%c\n",
SCALE (macro_maps_size),
STAT_LABEL (macro_maps_size));
fprintf (stderr, "Duplicated maps locations size: %5lu%c\n",
fprintf (stderr, "Duplicated maps locations size: %5ld%c\n",
SCALE (s.duplicated_macro_maps_locations_size),
STAT_LABEL (s.duplicated_macro_maps_locations_size));
fprintf (stderr, "Total allocated maps size: %5lu%c\n",
fprintf (stderr, "Total allocated maps size: %5ld%c\n",
SCALE (total_allocated_map_size),
STAT_LABEL (total_allocated_map_size));
fprintf (stderr, "Total used maps size: %5lu%c\n",
fprintf (stderr, "Total used maps size: %5ld%c\n",
SCALE (total_used_map_size),
STAT_LABEL (total_used_map_size));
fprintf (stderr, "\n");

8
libcpp/ChangeLog
View file

@ -1,3 +1,11 @@
2011-10-18 Dodji Seketeli <dodji@redhat.com>
PR bootstrap/50760
* include/line-map.h (struct linemap_stats): Change the type of
the members from size_t to long.
* macro.c (macro_arg_token_iter_init): Unconditionally initialize
iter->location_ptr.
2011-10-17 Dodji Seketeli <dodji@redhat.com>
* line-map.c (linemap_macro_map_loc_to_exp_point): Avoid setting a

22
libcpp/include/line-map.h
View file

@ -687,17 +687,17 @@ expanded_location linemap_expand_location_full (struct line_maps *,
linemap_get_statistics. */
struct linemap_stats
{
size_t num_ordinary_maps_allocated;
size_t num_ordinary_maps_used;
size_t ordinary_maps_allocated_size;
size_t ordinary_maps_used_size;
size_t num_expanded_macros;
size_t num_macro_tokens;
size_t num_macro_maps_used;
size_t macro_maps_allocated_size;
size_t macro_maps_used_size;
size_t macro_maps_locations_size;
size_t duplicated_macro_maps_locations_size;
long num_ordinary_maps_allocated;
long num_ordinary_maps_used;
long ordinary_maps_allocated_size;
long ordinary_maps_used_size;
long num_expanded_macros;
long num_macro_tokens;
long num_macro_maps_used;
long macro_maps_allocated_size;
long macro_maps_used_size;
long macro_maps_locations_size;
long duplicated_macro_maps_locations_size;
};
/* Compute and return statistics about the memory consumption of some

2
libcpp/line-map.c
View file

@ -1180,7 +1180,7 @@ void
linemap_get_statistics (struct line_maps *set,
struct linemap_stats *s)
{
size_t ordinary_maps_allocated_size, ordinary_maps_used_size,
long ordinary_maps_allocated_size, ordinary_maps_used_size,
macro_maps_allocated_size, macro_maps_used_size,
macro_maps_locations_size = 0, duplicated_macro_maps_locations_size = 0;

4
libcpp/macro.c
View file

@ -1278,6 +1278,10 @@ macro_arg_token_iter_init (macro_arg_token_iter *iter,
iter->track_macro_exp_p = track_macro_exp_p;
iter->kind = kind;
iter->token_ptr = token_ptr;
/* Unconditionally initialize this so that the compiler doesn't warn
about iter->location_ptr being possibly uninitialized later after
this code has been inlined somewhere. */
iter->location_ptr = NULL;
if (track_macro_exp_p)
iter->location_ptr = get_arg_token_location (arg, kind);
#ifdef ENABLE_CHECKING