diff options
| -rw-r--r-- | gcc/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/input.c | 26 | ||||
| -rw-r--r-- | gcc/input.h | 2 | ||||
| -rw-r--r-- | gcc/selftest.c | 1 |
4 files changed, 38 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7df2a9a..eb87011 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2016-08-18 David Malcolm <dmalcolm@redhat.com> + + * input.c (diagnostics_file_cache_forcibly_evict_file): New + function. + * input.h (diagnostics_file_cache_forcibly_evict_file): New + declaration. + * selftest.c (selftest::temp_source_file::~temp_source_file): + Evict m_filename from the diagnostic file cache. + 2016-08-18 Richard Biener <rguenther@suse.de> * tree-pass.h (make_pass_materialize_all_clones): Declare. diff --git a/gcc/input.c b/gcc/input.c index 172d13a..76a3307 100644 --- a/gcc/input.c +++ b/gcc/input.c @@ -249,6 +249,32 @@ lookup_file_in_cache_tab (const char *file_path) return r; } +/* Purge any mention of FILENAME from the cache of files used for + printing source code. For use in selftests when working + with tempfiles. */ + +void +diagnostics_file_cache_forcibly_evict_file (const char *file_path) +{ + gcc_assert (file_path); + + fcache *r = lookup_file_in_cache_tab (file_path); + if (!r) + /* Not found. */ + return; + + r->file_path = NULL; + if (r->fp) + fclose (r->fp); + r->fp = NULL; + r->nb_read = 0; + r->line_start_idx = 0; + r->line_num = 0; + r->line_record.truncate (0); + r->use_count = 0; + r->total_lines = 0; +} + /* Return the file cache that has been less used, recently, or the first empty one. If HIGHEST_USE_COUNT is non-null, *HIGHEST_USE_COUNT is set to the highest use count of the entries diff --git a/gcc/input.h b/gcc/input.h index c17e440..0f187c7 100644 --- a/gcc/input.h +++ b/gcc/input.h @@ -95,6 +95,8 @@ void dump_location_info (FILE *stream); void diagnostics_file_cache_fini (void); +void diagnostics_file_cache_forcibly_evict_file (const char *file_path); + struct GTY(()) string_concat { string_concat (int num, location_t *locs); diff --git a/gcc/selftest.c b/gcc/selftest.c index 0a7192e..d25f5c0 100644 --- a/gcc/selftest.c +++ b/gcc/selftest.c @@ -111,6 +111,7 @@ selftest::temp_source_file::temp_source_file (const location &loc, selftest::temp_source_file::~temp_source_file () { unlink (m_filename); + diagnostics_file_cache_forcibly_evict_file (m_filename); free (m_filename); } |