r271187 - in /branches/c++-modules: ChangeLog.m...

[nathan@gcc.gnu.org]

Author: nathan
Date: Tue May 14 18:53:22 2019
New Revision: 271187

URL: https://gcc.gnu.org/viewcvs?rev=271187&root=gcc&view=rev
Log:
	Cleanup merging, friend streaming.
	gcc/cp/
	* module.cc (trees_{in,out}::tree_mergeable): Reimplement.
	(trees_out::tree_value): Significant adjustment.
	(trees_in::tree_node): Likewise.
	(trees_{in,out}::tree_node_specific): Move into ...
	(trees_{in,out}::tree_node_bools): ... here.
	(trees_out::mark_mergeable): Delete.
	(trees_{in,out}::insert): Adjust.
	(trees_{in,out}::lang_vals): New, broken out of ...
	(trees_node_vals): ... here.  Call them.
	(trees_out::ref_node): Process mergeable cases.
	(trees_{in,out}::tpl_parms): Adjust.
	(trees_{in,out}::{read,write}_class_def): Stream and connect
	friend lists.
	(binding_cmp): Order hidden decls.
	(module_state::write_cluster): Adjust mergeable streaming.
	(module_State::read_cluster): Hide hidden overloads.
	* name-lookup.c (extract_module_binding): Don't skip hidden.
	gcc/testsuite/
	* g++.dg/modules/builtin-1_a.C: Adjust scans.
	* g++.dg/modules/class-3_b.C: Likewise.
	* g++.dg/modules/indirect-[24]_[bc].C: Likewise.
	* g++.dg/modules/inst-[123]_[bcd].C: Likewise.

Modified:
    branches/c++-modules/ChangeLog.modules
    branches/c++-modules/gcc/cp/module.cc
    branches/c++-modules/gcc/cp/name-lookup.c
    branches/c++-modules/gcc/cp/pt.c
    branches/c++-modules/gcc/testsuite/g++.dg/modules/builtin-1_a.C
    branches/c++-modules/gcc/testsuite/g++.dg/modules/class-3_b.C
    branches/c++-modules/gcc/testsuite/g++.dg/modules/indirect-2_c.C
    branches/c++-modules/gcc/testsuite/g++.dg/modules/indirect-4_b.C
    branches/c++-modules/gcc/testsuite/g++.dg/modules/inst-1_b.C
    branches/c++-modules/gcc/testsuite/g++.dg/modules/inst-2_b.C
    branches/c++-modules/gcc/testsuite/g++.dg/modules/inst-3_b.C
    branches/c++-modules/gcc/testsuite/g++.dg/modules/part-3_c.C
    branches/c++-modules/gcc/testsuite/g++.dg/modules/part-3_d.C