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

[nathan@gcc.gnu.org]

Author: nathan
Date: Fri Feb  2 14:17:34 2018
New Revision: 257332

URL: https://gcc.gnu.org/viewcvs?rev=257332&root=gcc&view=rev
Log:
	Fix circularity detection, and other errors
	gcc/cp/
	* module.c (elf::E_BAD_DATA, elf::E_BAD_IMPORT): New.
	(elf::set_error): Default to E_BAD_DATA.
	(elf::end, elf_out::end): Return error string.
	(module_state::set_location): New.
	(module_state::{push,pop}_location): Adjust.
	(do_module_import): Fixup circularity and other errors.
	(declare_module, finish_module): Adjust.
	gcc/testsuite/
	* g++.dg/modules/circ-1_[abcd].C: New.
	* g++.dg/modules/mod-decl-1.C: Adjust errors.
	* g++.dg/modules/mod-decl-2_b.C: Adjust errors.
	* g++.dg/modules/mod-decl-5_b.C: Adjust errors.
	* g++.dg/modules/mod-stamp-1-d.C: Adjust errors.

Added:
    branches/c++-modules/gcc/testsuite/g++.dg/modules/circ-1_a.C
    branches/c++-modules/gcc/testsuite/g++.dg/modules/circ-1_b.C
    branches/c++-modules/gcc/testsuite/g++.dg/modules/circ-1_c.C
    branches/c++-modules/gcc/testsuite/g++.dg/modules/circ-1_d.C
Modified:
    branches/c++-modules/ChangeLog.modules
    branches/c++-modules/gcc/cp/module.c
    branches/c++-modules/gcc/testsuite/g++.dg/modules/mod-decl-1.C
    branches/c++-modules/gcc/testsuite/g++.dg/modules/mod-decl-2_b.C
    branches/c++-modules/gcc/testsuite/g++.dg/modules/mod-decl-5_b.C
    branches/c++-modules/gcc/testsuite/g++.dg/modules/mod-stamp-1_d.C