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

[nathan@gcc.gnu.org]

Author: nathan
Date: Thu Nov 29 15:34:26 2018
New Revision: 266626

URL: https://gcc.gnu.org/viewcvs?rev=266626&root=gcc&view=rev
Log:
	Global module var declaration merging.
	gcc/cp/
	* module.cc (trees_in::reserve_gmes): Add headroom.
	(trees_{in,out}::tree_gme): Deal with VAR_DECLs.
	(module_state::write_cluster): Likewise.
	* name-lookup.c (match_global_decl): Likewise.
	gcc/testsuite/
	* g++.dg/modules/leg-merge-3_[abcd].[CH]: New.

Added:
    branches/c++-modules/gcc/testsuite/g++.dg/modules/leg-merge-3_a.H
    branches/c++-modules/gcc/testsuite/g++.dg/modules/leg-merge-3_b.H
    branches/c++-modules/gcc/testsuite/g++.dg/modules/leg-merge-3_c.C
    branches/c++-modules/gcc/testsuite/g++.dg/modules/leg-merge-3_d.C
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/testsuite/g++.dg/modules/leg-merge-1_a.H