2019-11-05 Nathan Sidwell <nathan@acm.org>
cp/
PR c++/92370
* parser.c (cp_parser_error_1): Check EOF and UNKNOWN_LOCATION
when skipping over version control marker.
testsuite/
PR c++/92370
* g++.dg/pr92370.C: New.
===================================================================
@@ -2890,12 +2890,16 @@ cp_parser_error_1 (cp_parser* parser, co
error_at (loc, "version control conflict marker in file");
expanded_location token_exploc = expand_location (token->location);
/* Consume tokens until the end of the source line. */
- while (1)
+ for (;;)
{
cp_lexer_consume_token (parser->lexer);
cp_token *next = cp_lexer_peek_token (parser->lexer);
- if (next == NULL)
+ if (next->type == CPP_EOF)
break;
+ if (next->location == UNKNOWN_LOCATION
+ || loc == UNKNOWN_LOCATION)
+ break;
+
expanded_location next_exploc = expand_location (next->location);
if (next_exploc.file != token_exploc.file)
break;
===================================================================
@@ -0,0 +1,3 @@
+// PR 92370 ICE with conlict marker
+
+<<<<<<<>>>>>>> // { dg-error "conflict marker" }