Merged revisions 184777,184779,184812,184842,184848,184853,184861,184871,184878,184895,184909,184921,184931,184950-184951,184954,184956,184970,184991-184992,185001,185023,185034,185063,185077,185087,185102,185119,185151,185164,185170,185180,185185,185189,185206,185209,185234,185237,185239,185243,185248,185275,185359-185360,185364,185366,185370,185383,185402,185405,185432,185440,185450,185457,185480,185497,185506,185513,185551,185592,185606,185626,185630-185674,185679,185681-185683,185685-185686,185690,185696-185697,185704-185706,185708,185710-185711,185713-185714,185717,185720,185723,185726,185733,185738,185740,185743,185747,185749,185755,185759-185760,185763,185766,185771,185781,185785,185794,185805,185828,185864,185877,185879,185896,185901,185905,185908-185909,185911,185916,185918,185920,185926,185929,185932,185934,185936,185939,185942,185947,185961,185964,185967,185969,185972,185979,185984,185987,185989,185991,186014,186021-186022,186025,186027,186030,186033,186036-186037,186039,186046,186048,186053,186061,186089,186096,186103,186105,186107-186108,186113,186115,186121,186124,186127,186141,186145,186152,186173,186178,186180,186188,186195-186197,186207,186214-186215,186218,186221,186232,186236,186238,186242,186249,186255,186262,186264,186266,186296,186300,186359-186360,186367,186370,186376-186377,186392,186394,186401,186404,186409,186412,186417,186424-186425,186430,186435-186436,186443,186459,186461,186473,186477,186481,186489,186500,186510,186512,186515,186517,186531-186533,186543-186544,186556,186573,186583,186589,186603,186606,186608,186611,186630,186632,186634,186636,186638,186641,186643,186648,186650-186651,186656,186661,186671,186677,186679,186684,186686,186691,186695,186698-186699,186713,186716-186717,186723,186728,186733,186740,186743,186745,186765,186767,186770,186773,186775,186779,186782,186785,186787,186792,186802,186804,186809-186810,186841-186842,186848-186849,186853,186858 via svnmerge from

svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch


Bugs fixed (http://gcc.gnu.org/bugzilla)

Optimizers
  52592

C
  52577, 52682, 52862, 53060

C++
  52521, 52582, 52671, 52433, 52487, 52540, 52746, 52743, 52759,
  52685, 52718, 52672, 52799, 52796, 52596, 52476, 52591, 52924,
  52942, 52822, 52824, 52699, 52465, 52292, 52380, 52689, 50303,
  50830, 38543, 53003, 52839, 53027, 53067


Fortran
  52452, 52758, 52668, 52893,

Optimizers/Codegen
  52545, 52547, 52640, 52720, 51893, 52750, 52691, 52693, 52835,
  52493, 52678, 52701, 52754, 52580, 52406, 52894, 52943, 52969,
  52939, 52891,

PPC
  50310, 52775

x86
  52736, 52698, 52932, 53020,


Other notable changes

C++
  Mangling fixes: revs 185606, 185704
  	gcc/cp/
  	* mangle.c (write_type): Handle 'auto'.
  	* init.c (build_new): Don't do auto deduction where it might
  	affect template mangling.
  	libiberty/
  	* cp-demangle.c (cplus_demangle_type): Handle 'auto'.

  	* cp-demangle.c (cplus_demangle_operators): Add li.
  	(d_unqualified_name): Handle it specially.

  C++11 changes (LWG 1310): rev 186404
  	* include/bits/forward_list.h (splice_after(const_iterator,
  	forward_list&), splice_after(const_iterator, forward_list&,
  	consst_iterator), splice_after(const_iterator, forward_list&,
  	const_iterator, const_iterator), merge(forward_list&),
  	merge(forward_list&, _Comp)): Add per C++11 as published (and
  	LWG 1310).
  	* include/debug/forward_list: Adjust.
  
  	* include/bits/forward_list.h (splice_after(const_iterator,
  	forward_list&&, const_iterator)): Only declare.
  	(_M_transfer_after): Remove.
  	(_M_splice_after(const_iterator, forward_list&&)): Change signature.
  	(splice_after(const_iterator, forward_list&&, const_iterator,
  	const_iterator)): Use the latter.
  	* include/bits/forward_list.tcc (splice_after(const_iterator,
  	forward_list&&, const_iterator)): Define here.
  	(_M_splice_after): Define, use throughout.
  
  	* include/bits/forward_list.h (insert_after(const_iterator,
  	std::initializer_list<_Tp>)): Forward to insert_after(const_iterator,
  	_InputIterator, _InputIterator).
  	* include/bits/forward_list.tcc: Remove definition.
  
  	* testsuite/23_containers/forward_list/modifiers/6.cc: New.
  	* testsuite/23_containers/forward_list/operations/1.cc: Adjust.
  
  	* testsuite/23_containers/forward_list/requirements/dr438/
  	assign_neg.cc: Adjust dg-error line number.
  	* testsuite/23_containers/forward_list/requirements/dr438/
  	insert_neg.cc: Likewise.
  	* testsuite/23_containers/forward_list/requirements/dr438/
  	constructor_1_neg.cc: Likewise.
  	* testsuite/23_containers/forward_list/requirements/dr438/
  	constructor_2_neg.cc: Likewise.



git-svn-id: https://gcc.gnu.org/svn/gcc/branches/google/gcc-4_7-integration@186906 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 7 insertions, 3 deletions

diff --git a/libgo/go/exp/gotype/gotype.go b/libgo/go/exp/gotype/gotype.go
index a2a9361866d..3aca40e8e74 100644
--- a/libgo/go/exp/gotype/gotype.go
+++ b/libgo/go/exp/gotype/gotype.go
@@ -27,8 +27,9 @@ var (
 	allErrors = flag.Bool("e", false, "print all (including spurious) errors")
 
 	// debugging support
-	printTrace = flag.Bool("trace", false, "print parse trace")
-	printAST   = flag.Bool("ast", false, "print AST")
+	parseComments = flag.Bool("comments", false, "parse comments (ignored if -ast not set)")
+	printTrace    = flag.Bool("trace", false, "print parse trace")
+	printAST      = flag.Bool("ast", false, "print AST")
 )
 
 var exitCode = 0
@@ -73,6 +74,9 @@ func parse(fset *token.FileSet, filename string, src []byte) *ast.File {
 	if *allErrors {
 		mode |= parser.SpuriousErrors
 	}
+	if *parseComments && *printAST {
+		mode |= parser.ParseComments
+	}
 	if *printTrace {
 		mode |= parser.Trace
 	}
@@ -167,7 +171,7 @@ func processFiles(filenames []string, allFiles bool) {
 
 func processPackage(fset *token.FileSet, files map[string]*ast.File) {
 	// make a package (resolve all identifiers)
-	pkg, err := ast.NewPackage(fset, files, types.GcImporter, types.Universe)
+	pkg, err := ast.NewPackage(fset, files, types.GcImport, types.Universe)
 	if err != nil {
 		report(err)
 		return