OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR lto/46808 (Too verbose diagnostic messages when compiling with LTO)

Browse Source 
2010-12-10  Richard Guenther  <rguenther@suse.de>

	PR lto/46808
	* lto-symtab.c (lto_symtab_merge_decls_2): Avoid type warnings
	after errors.
	(lto_symtab_merge_decls_1): Adjust.

From-SVN: r167690
This commit is contained in:
Richard Guenther 2010-12-10 15:53:58 +00:00 committed by Richard Biener
parent d479b12851
commit 97ce54b9ed
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/ChangeLog
View File

@ -1,3 +1,10 @@
2010-12-10 Richard Guenther <rguenther@suse.de>
PR lto/46808
* lto-symtab.c (lto_symtab_merge_decls_2): Avoid type warnings
after errors.
(lto_symtab_merge_decls_1): Adjust.
2010-12-10 Dave Korn <dave.korn.cygwin@gmail.com>
PR middle-end/46674

16
gcc/lto-symtab.c
View File

@ -593,16 +593,16 @@ found:
}
/* Merge all decls in the symbol table chain to the prevailing decl and
issue diagnostics about type mismatches. */
issue diagnostics about type mismatches. If DIAGNOSED_P is true
do not issue further diagnostics.*/
static void
lto_symtab_merge_decls_2 (void **slot)
lto_symtab_merge_decls_2 (void **slot, bool diagnosed_p)
{
lto_symtab_entry_t prevailing, e;
VEC(tree, heap) *mismatches = NULL;
unsigned i;
tree decl;
bool diagnosed_p = false;
/* Nothing to do for a single entry. */
prevailing = (lto_symtab_entry_t) *slot;
@ -612,7 +612,8 @@ lto_symtab_merge_decls_2 (void **slot)
/* Try to merge each entry with the prevailing one. */
for (e = prevailing->next; e; e = e->next)
{
if (!lto_symtab_merge (prevailing, e))
if (!lto_symtab_merge (prevailing, e)
&& !diagnosed_p)
VEC_safe_push (tree, heap, mismatches, e->decl);
}
if (VEC_empty (tree, mismatches))
@ -751,12 +752,7 @@ lto_symtab_merge_decls_1 (void **slot, void *data ATTRIBUTE_UNUSED)
/* Merge the chain to the single prevailing decl and diagnose
mismatches. */
lto_symtab_merge_decls_2 (slot);
/* Drop all but the prevailing decl from the symtab. */
if (TREE_CODE (prevailing->decl) != FUNCTION_DECL
&& TREE_CODE (prevailing->decl) != VAR_DECL)
prevailing->next = NULL;
lto_symtab_merge_decls_2 (slot, diagnosed_p);
/* Store resolution decision into the callgraph.
In LTRANS don't overwrite information we stored into callgraph at