summaryrefslogtreecommitdiff
path: root/libcpp
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2021-05-20 09:09:07 +0200
committerJakub Jelinek <jakub@redhat.com>2021-05-20 09:09:07 +0200
commitd15a2d261b24adcbfe5e663b15dde3df5d2b3486 (patch)
tree0d66af0a7621c749e2a64d876f63c17e9de21133 /libcpp
parent75ab8b4829dec8c70470e8225c9add964f71ed74 (diff)
downloadgcc-d15a2d261b24adcbfe5e663b15dde3df5d2b3486.tar.gz
libcpp: Fix up -fdirectives-only handling of // comments on last line not terminated with newline [PR100646]
As can be seen on the testcases, before the -fdirectives-only preprocessing rewrite the preprocessor would assume // comments are terminated by the end of file even when newline wasn't there, but now we error out. The following patch restores the previous behavior. 2021-05-20 Jakub Jelinek <jakub@redhat.com> PR preprocessor/100646 * lex.c (cpp_directive_only_process): Treat end of file as termination for !is_block comments. * gcc.dg/cpp/pr100646-1.c: New test. * gcc.dg/cpp/pr100646-2.c: New test.
Diffstat (limited to 'libcpp')
-rw-r--r--libcpp/lex.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libcpp/lex.c b/libcpp/lex.c
index 6fd722ab263..3618fa5d737 100644
--- a/libcpp/lex.c
+++ b/libcpp/lex.c
@@ -4480,8 +4480,9 @@ cpp_directive_only_process (cpp_reader *pfile,
break;
}
}
- cpp_error_with_line (pfile, CPP_DL_ERROR, sloc, 0,
- "unterminated comment");
+ if (pos < limit || is_block)
+ cpp_error_with_line (pfile, CPP_DL_ERROR, sloc, 0,
+ "unterminated comment");
done_comment:
lwm = pos;
break;