mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-01-11 18:05:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

c-parse.in (if_stmt_locus): New object.

Browse Source 
* c-parse.in (if_stmt_locus): New object.
	(if_prefix rule): Use it.  Don't use warning_with_file_and_line.
	(select_or_iter_stmt rule): Likewise.
	(if_stmt_file): Remove.
	(if_stmt_line): Likewise.
	* jump.c: include "diagnostic.h"
	(never_reached_warning): Don't use warning_with_file_and_line.
	* Makefile.in (jump.o): Add dependce on diagnostic.h

From-SVN: r66627
This commit is contained in:
Gabriel Dos Reis 2003-05-09 09:25:34 +00:00 committed by Gabriel Dos Reis
parent 2c478ce37c
commit 49468c8be1
4 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gcc/ChangeLog
View File

@ -1,3 +1,14 @@
2003-05-09 Gabriel Dos Reis <gdr@integrable-solutions.net>
* c-parse.in (if_stmt_locus): New object.
(if_prefix rule): Use it. Don't use warning_with_file_and_line.
(select_or_iter_stmt rule): Likewise.
(if_stmt_file): Remove.
(if_stmt_line): Likewise.
* jump.c: include "diagnostic.h"
(never_reached_warning): Don't use warning_with_file_and_line.
* Makefile.in (jump.o): Add dependce on diagnostic.h
2003-05-09 Alan Modra <amodra@bigpond.net.au>
* expr.c (move_block_from_reg): Remove "size" parm. Localize vars.

3
gcc/Makefile.in
View File

@ -1578,7 +1578,8 @@ integrate.o : integrate.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $
$(PARAMS_H) $(TM_P_H) $(TARGET_H) langhooks.h gt-integrate.h
jump.o : jump.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) flags.h \
hard-reg-set.h $(REGS_H) insn-config.h $(RECOG_H) $(EXPR_H) real.h except.h function.h \
toplev.h $(INSN_ATTR_H) $(TM_P_H) reload.h $(PREDICT_H) $(TIMEVAR_H)
toplev.h $(INSN_ATTR_H) $(TM_P_H) reload.h $(PREDICT_H) $(TIMEVAR_H) \
diagnostic.h
simplify-rtx.o : simplify-rtx.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) \
$(REGS_H) hard-reg-set.h flags.h real.h insn-config.h $(RECOG_H) $(EXPR_H) toplev.h \

14
gcc/c-parse.in
View File

@ -261,10 +261,10 @@ end ifobjc
static int stmt_count;
static int compstmt_count;
/* Input file and line number of the end of the body of last simple_if;
/* Input location of the end of the body of last simple_if;
used by the stmt-rule immediately after simple_if returns. */
static const char *if_stmt_file;
static int if_stmt_line;
static location_t if_stmt_locus;
/* List of types and structure classes of the current declaration. */
static GTY(()) tree current_declspecs;
@ -2215,8 +2215,8 @@ if_prefix:
{ c_expand_start_cond (c_common_truthvalue_conversion ($4),
compstmt_count,$<ttype>2);
$<itype>$ = stmt_count;
if_stmt_file = $<filename>-2;
if_stmt_line = $<lineno>-1; }
if_stmt_locus.file = $<filename>-2;
if_stmt_locus.line = $<lineno>-1; }
;
/* This is a subroutine of stmt.
@ -2305,8 +2305,8 @@ select_or_iter_stmt:
else statement. Increment stmt_count so we don't
give a second error if this is a nested `if'. */
if (extra_warnings && stmt_count++ == $<itype>1)
warning_with_file_and_line (if_stmt_file, if_stmt_line,
"empty body in an if-statement"); }
warning ("%Hempty body in an if-statement",
&if_stmt_locus); }
/* Make sure c_expand_end_cond is run once
for each call to c_expand_start_cond.
Otherwise a crash is likely. */

10
gcc/jump.c
View File

@ -54,6 +54,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include "reload.h"
#include "predict.h"
#include "timevar.h"
#include "diagnostic.h"
/* Optimize jump y; x: ... y: jumpif... x?
Don't know if it is worth bothering with. */
@ -1951,9 +1952,12 @@ never_reached_warning (avoided_insn, finish)
reached_end = 1;
}
if (two_avoided_lines && contains_insn)
warning_with_file_and_line (NOTE_SOURCE_FILE (a_line_note),
NOTE_LINE_NUMBER (a_line_note),
"will never be executed");
{
location_t locus;
locus.file = NOTE_SOURCE_FILE (a_line_note);
locus.line = NOTE_LINE_NUMBER (a_line_note);
warning ("%Hwill never be executed", &locus);
}
}
/* Throughout LOC, redirect OLABEL to NLABEL. Treat null OLABEL or