re PR c++/69793 (ICE on invalid code in "cp_lexer_peek_nth_token")

/cp
2016-05-18  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/69793
	* parser.c (cp_parser_template_id): Don't call cp_lexer_peek_nth_token
	when the previous cp_lexer_peek_token returns CPP_EOF.

/testsuite
2016-05-18  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/69793
	* g++.dg/template/crash122.C: New.

From-SVN: r236414

gcc/cp/ChangeLog

 2016-05-18  Paolo Carlini  <paolo.carlini@oracle.com>
 
+	PR c++/69793
+	* parser.c (cp_parser_template_id): Don't call cp_lexer_peek_nth_token
+	when the previous cp_lexer_peek_token returns CPP_EOF.
+
+2016-05-18  Paolo Carlini  <paolo.carlini@oracle.com>
+
 	PR c++/70466
 	* call.c (convert_like_real): Check that we are actually converting
 	from an init list.

gcc/cp/parser.c

@@ -14835,11 +14835,11 @@ cp_parser_template_id (cp_parser *parser,
   /* If we find the sequence `[:' after a template-name, it's probably
      a digraph-typo for `< ::'. Substitute the tokens and check if we can
      parse correctly the argument list.  */
-  next_token = cp_lexer_peek_token (parser->lexer);
-  next_token_2 = cp_lexer_peek_nth_token (parser->lexer, 2);
-  if (next_token->type == CPP_OPEN_SQUARE
+  if (((next_token = cp_lexer_peek_token (parser->lexer))->type
+       == CPP_OPEN_SQUARE)
       && next_token->flags & DIGRAPH
-      && next_token_2->type == CPP_COLON
+      && ((next_token_2 = cp_lexer_peek_nth_token (parser->lexer, 2))->type
+	  == CPP_COLON)
       && !(next_token_2->flags & PREV_WHITE))
     {
       cp_parser_parse_tentatively (parser);

gcc/testsuite/ChangeLog

 2016-05-18  Paolo Carlini  <paolo.carlini@oracle.com>
 
+	PR c++/69793
+	* g++.dg/template/crash122.C: New.
+
+2016-05-18  Paolo Carlini  <paolo.carlini@oracle.com>
+
 	PR c++/70466
 	* g++.dg/template/pr70466-1.C: New.
 	* g++.dg/template/pr70466-2.C: Likewise.

gcc/testsuite/g++.dg/template/crash122.C

+// PR c++/69793
+
+class fpos;
+template < state > bool operator!= (fpos,; operator!= // { dg-error "declared|expected|type" }