r177917 - in /branches/pph/gcc: cp/ChangeLog.pp...

[gchare at gcc dot gnu dot org]

Author: gchare
Date: Fri Aug 19 23:17:08 2011
New Revision: 177917

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=177917
Log:
Fixed line_table streaming implementation to work with referenced child includes.

	gcc/cp/ChangeLog.pph
	* pph-streamer-in.c (pph_in_includes): Remove.
	(pph_in_linetable_marker): New.
	(pph_in_line_table_and_includes): Renamed from
	pph_in_and_merge_line_table.
	Now handles line_table and includes input in parallel.
	Now returns source_location corresponding to line 1 / col 0
	of the header currently loaded as pph.
	(pph_read_file_1): Read line_table and includes before replaying
	tokens. Use location returned by pph_in_line_table_and_includes
	as forced token location for replayed tokens.
	* pph-streamer-out.c (pph_out_includes): Remove.
	(pph_out_linetable_marker): New.
	(pph_filename_eq_ignoring_path): New.
	(pph_get_next_include): New.
	(pph_out_line_table_and_includes): Renamed from pph_out_line_table.
	Now handles output of both the line_table and includes references
	in parallel.
	(pph_write_file): Write out line_table and includes before
	identifiers.
	* pph-streamer.h (enum pph_linetable_marker): New.
	* pph.c (pph_include_handler): Add hack to mimic
	line_table->highest_location behaviour in _cpp_stack_include used
	by the non-pph compiler.

	gcc/testsuite/ChangeLog.pph
	* g++.dg/pph/p4eabi1.cc: Remove asm xdiff.
	* g++.dg/pph/x4keyed.cc: Changed line info for expected failure.
	* g++.dg/pph/x7rtti.cc: Changed line info for expected failures.

Modified:
    branches/pph/gcc/cp/ChangeLog.pph
    branches/pph/gcc/cp/pph-streamer-in.c
    branches/pph/gcc/cp/pph-streamer-out.c
    branches/pph/gcc/cp/pph-streamer.h
    branches/pph/gcc/cp/pph.c
    branches/pph/gcc/testsuite/ChangeLog.pph
    branches/pph/gcc/testsuite/g++.dg/pph/p4eabi1.cc
    branches/pph/gcc/testsuite/g++.dg/pph/x4keyed.cc
    branches/pph/gcc/testsuite/g++.dg/pph/x7rtti.cc