+2002-01-03 Andreas Schwab <schwab@suse.de>
+
+ * cppfiles.c (_cpp_pop_file_buffer): Change return type to bool
+ and return true if _cpp_push_next_buffer pushed a new include
+ file.
+ * cpplib.c (_cpp_pop_buffer): Only call obstack_free if
+ _cpp_pop_file_buffer did not push a new file.
+ * cpphash.h (_cpp_pop_file_buffer): Update declaration.
+
2002-01-02 Eric Christopher <echristo@redhat.com>
* final.c (final_scan_insn): Change 0 -> NULL_RTX in
/* Do appropriate cleanup when a file buffer is popped off the input
stack. Push the next -include file, if any remain. */
-void
+bool
_cpp_pop_file_buffer (pfile, inc)
cpp_reader *pfile;
struct include_file *inc;
{
+ bool pushed = false;
+
/* Record the inclusion-preventing macro, which could be NULL
meaning no controlling macro. */
if (pfile->mi_valid && inc->cmacro == NULL)
/* Finally, push the next -included file, if any. */
if (!pfile->buffer->prev)
- _cpp_push_next_buffer (pfile);
+ pushed = _cpp_push_next_buffer (pfile);
}
+
+ return pushed;
}
/* Returns the first place in the include chain to start searching for
extern void _cpp_report_missing_guards PARAMS ((cpp_reader *));
extern void _cpp_init_includes PARAMS ((cpp_reader *));
extern void _cpp_cleanup_includes PARAMS ((cpp_reader *));
-extern void _cpp_pop_file_buffer PARAMS ((cpp_reader *,
+extern bool _cpp_pop_file_buffer PARAMS ((cpp_reader *,
struct include_file *));
/* In cppexp.c */
{
cpp_buffer *buffer = pfile->buffer;
struct if_stack *ifs;
+ bool pushed = false;
/* Walk back up the conditional stack till we reach its level at
entry to this file, issuing error messages. */
pfile->buffer = buffer->prev;
if (buffer->inc)
- _cpp_pop_file_buffer (pfile, buffer->inc);
+ pushed = _cpp_pop_file_buffer (pfile, buffer->inc);
- obstack_free (&pfile->buffer_ob, buffer);
+ if (!pushed)
+ obstack_free (&pfile->buffer_ob, buffer);
}
void