diff options
| author | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-03-06 16:18:40 +0000 |
|---|---|---|
| committer | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-03-06 16:18:40 +0000 |
| commit | 914db4b784e45909e13d0c229baf49234e4310bb (patch) | |
| tree | 81d6fae2161fe976ca587b7a58d10fda41f7e93b /libcpp/files.c | |
| parent | 3687a208b7bfca87fc95ab9e26fa63d0edf474b5 (diff) | |
| download | gcc-914db4b784e45909e13d0c229baf49234e4310bb.tar.gz | |
PR middle-end/56461
* internal.h (struct cpp_buffer): Add to_free field.
(_cpp_pop_file_buffer): Add third argument.
* files.c (_cpp_stack_file): Set buffer->to_free.
(_cpp_pop_file_buffer): Add to_free argument. Free to_free
if non-NULL, and if equal to file->buffer_start, also clear
file->buffer{,_start,_valid}.
* directives.c (_cpp_pop_buffer): Pass buffer->to_free
to _cpp_pop_file_buffer.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@196497 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libcpp/files.c')
| -rw-r--r-- | libcpp/files.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/libcpp/files.c b/libcpp/files.c index dae5526997f..5c5a0b9b514 100644 --- a/libcpp/files.c +++ b/libcpp/files.c @@ -894,6 +894,7 @@ _cpp_stack_file (cpp_reader *pfile, _cpp_file *file, bool import) && !CPP_OPTION (pfile, directives_only)); buffer->file = file; buffer->sysp = sysp; + buffer->to_free = file->buffer_start; /* Initialize controlling macro state. */ pfile->mi_valid = true; @@ -1435,7 +1436,8 @@ cpp_push_default_include (cpp_reader *pfile, const char *fname) /* Do appropriate cleanup when a file INC's buffer is popped off the input stack. */ void -_cpp_pop_file_buffer (cpp_reader *pfile, _cpp_file *file) +_cpp_pop_file_buffer (cpp_reader *pfile, _cpp_file *file, + const unsigned char *to_free) { /* Record the inclusion-preventing macro, which could be NULL meaning no controlling macro. */ @@ -1445,12 +1447,15 @@ _cpp_pop_file_buffer (cpp_reader *pfile, _cpp_file *file) /* Invalidate control macros in the #including file. */ pfile->mi_valid = false; - if (file->buffer_start) + if (to_free) { - free ((void *) file->buffer_start); - file->buffer_start = NULL; - file->buffer = NULL; - file->buffer_valid = false; + if (to_free == file->buffer_start) + { + file->buffer_start = NULL; + file->buffer = NULL; + file->buffer_valid = false; + } + free ((void *) to_free); } } |