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

[crowl@gcc.gnu.org]

Author: crowl
Date: Wed Nov  2 03:23:59 2011
New Revision: 180759

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=180759
Log:
Add merging of static_decls in bindings.  Due to the current
structure, this change is currently only effective at namespace scope.
Consequently, there are no changes to test status.  We may need to
make all bindings merged by default.


Index: gcc/cp/ChangeLog.pph

2011-11-01   Lawrence Crowl  <crowl@google.com>

	* pph-streamer-out.c (pph_out_binding_level_1): Remove streaming of
	static_decls.
	(pph_out_binding_level): Add streaming of static_decls.
	(pph_out_binding_merge_bodies): Likewise.
	* pph-streamer-in.c (pph_is_tree_element_of_vec): New.
	(pph_union_two_tree_vecs): New.
	(pph_union_into_tree_vec): New.
	(pph_in_binding_level_1): Remove streaming of static_decls.
	(pph_in_binding_level): Add streaming of static_decls.
	(pph_in_binding_merge_bodies): Add merging of static_decls from
	streamer into existing binding.  Needs new function parameter.
	(pph_in_merge_key_tree): Preallocate namespace cp_binding_level.
	(pph_in_global_binding): Update call to pph_in_binding_merge_bodies.



Modified:
    branches/pph/gcc/cp/ChangeLog.pph
    branches/pph/gcc/cp/pph-streamer-in.c
    branches/pph/gcc/cp/pph-streamer-out.c