* cppfiles.c (stack_include_file): line-map.c now handles include

	depth.
	(handle_missing_handler): Similarly.
	(_cpp_execute_include): Similarly.
	(_cpp_pop_file_buffer): Similarly.
	* cpphash.h (struct cpp_reader): Remove system_include_depth,
	buffer_stack_depth and include_depth.
	* cpplib.c (do_include_common): line-map.c now handles include depth.
	(cpp_push_buffer): Similarly.
	(_cpp_pop_buffer): Similarly.
	* cppmacro.c (builtin_macro): Update.
	* line-map.c (init_line_maps): Set depth.
	(add_line_map): Increment "used" earlier.  Update and use the
	include depth.
	(trace_include): Use the include depth.
	* line-map.h (struct line_maps): New member depth.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@45085 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 3 insertions, 0 deletions

diff --git a/gcc/line-map.h b/gcc/line-map.h
index a226a1fdfc2..835cb317753 100644
--- a/gcc/line-map.h
+++ b/gcc/line-map.h
@@ -60,6 +60,9 @@ struct line_maps
      has been listed yet.  */
   int last_listed;
 
+  /* Depth of the include stack, including the current file.  */
+  unsigned int depth;
+
   /* If true, prints an include trace a la -H.  */
   bool trace_includes;
 };