This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[cs] more information when invalidating fragments
- From: Per Bothner <per at bothner dot com>
- To: gcc-patches at gcc dot gnu dot org
- Date: Mon, 15 Sep 2003 15:22:39 -0700
- Subject: [cs] more information when invalidating fragments
I checked in this patch to the compile-server branch.
(I also merged in Zem's patch to pp_construct.)
--
--Per Bothner
per@bothner.com http://per.bothner.com/
2003-09-15 Per Bothner <pbothner@apple.com>
* c-common.c (warn_fragment_invalidation): New "flag" - for
now just a macro for !quiet_flag.
(cb_enter_fragment, cb_exit_fragmnet): Be more specific when
warning about invalidating a fragment.
Index: c-common.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/c-common.c,v
retrieving revision 1.438.2.5
diff -u -p -r1.438.2.5 c-common.c
--- c-common.c 12 Sep 2003 22:19:54 -0000 1.438.2.5
+++ c-common.c 15 Sep 2003 22:09:33 -0000
@@ -4428,6 +4428,8 @@ restore_fragment (cpp_fragment *fragment
(so cpp can skip to the end of the fragment). Otherwise, sets things
up so we can remember new bindings as we see them. */
+#define warn_fragment_invalidation (! quiet_flag)
+
bool
cb_enter_fragment (reader, fragment, name, line)
cpp_reader* reader ATTRIBUTE_UNUSED;
@@ -4446,14 +4448,23 @@ cb_enter_fragment (reader, fragment, nam
else
{
int i;
- valid = st->valid && ! currently_nested;
+ valid = st->valid;
+
+ if (currently_nested && valid)
+ {
+ valid = 0;
+ if (warn_fragment_invalidation)
+ warning ("invalidating cached fragment %s:%d because inside declaration", name, line);
+ }
- if (st->include_timestamp >= main_timestamp)
+ if (st->include_timestamp >= main_timestamp && valid)
{
/* This fragment has already been included for this main file.
Perhaps there are missing header guards. Easiest way to get
the correct re-definition errors is to force reparsing. */
valid = 0;
+ if (warn_fragment_invalidation)
+ warning ("invalidating cached fragment %s:%d because already included", name, line);
}
if (valid)
@@ -4474,6 +4485,8 @@ cb_enter_fragment (reader, fragment, nam
|| uses->read_timestamp > st->read_timestamp)
{
valid = 0;
+ if (warn_fragment_invalidation)
+ warning ("invalidating cached fragment %s:%d because of %s", name, line, uses->name);
break;
}
}
@@ -4482,8 +4495,6 @@ cb_enter_fragment (reader, fragment, nam
if (! valid)
{
st->valid = 0;
- if (! quiet_flag)
- fprintf (stderr, "(invalidating cached fragment %s:%d)\n", name, line);
}
else
{
@@ -4582,7 +4593,14 @@ cb_exit_fragment (reader, fragment)
}
current_c_fragment = NULL;
- st->valid = ! currently_nested;
+ if (currently_nested)
+ {
+ if (warn_fragment_invalidation)
+ warning ("invalidating cached fragment in %s because inside declaration", st->name);
+ st->valid = 0;
+ }
+ else
+ st->valid = 1;
}
#if 0
fprintf(stderr, "(pop deps start:%d end:%d for %s ret:%s)\n",