diff options
| author | David Malcolm <dmalcolm@redhat.com> | 2016-02-08 17:33:45 +0000 |
|---|---|---|
| committer | David Malcolm <dmalcolm@gcc.gnu.org> | 2016-02-08 17:33:45 +0000 |
| commit | 44714d8ce1ec1b5ac5dc9a2ed3d57713b9253e81 (patch) | |
| tree | 9fcd123fd85a32e3a218356b240e6888a8a295fa /gcc | |
| parent | f258ad62e3ede7069fa9d3926d6377c111f9c6e5 (diff) | |
| download | gcc-44714d8ce1ec1b5ac5dc9a2ed3d57713b9253e81.zip gcc-44714d8ce1ec1b5ac5dc9a2ed3d57713b9253e81.tar.gz gcc-44714d8ce1ec1b5ac5dc9a2ed3d57713b9253e81.tar.bz2 | |
PR preprocessor/69664: fix rich_location::override_column
gcc/testsuite/ChangeLog:
PR preprocessor/69664
* gcc.dg/cpp/trad/comment-2.c: Add expected column number.
* gcc.dg/cpp/warn-comments.c: Likewise.
libcpp/ChangeLog:
PR preprocessor/69664
* errors.c (cpp_diagnostic_with_line): Only call
rich_location::override_column if the column is non-zero.
* line-map.c (rich_location::override_column): Update columns
within m_ranges[0]. Add assertions to verify that doing so is
sane.
From-SVN: r233223
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/cpp/trad/comment-2.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/cpp/warn-comments.c | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b30f01d..82521ec 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2016-02-08 David Malcolm <dmalcolm@redhat.com> + + PR preprocessor/69664 + * gcc.dg/cpp/trad/comment-2.c: Add expected column number. + * gcc.dg/cpp/warn-comments.c: Likewise. + 2016-02-08 Marek Polacek <polacek@redhat.com> PR c++/69688 diff --git a/gcc/testsuite/gcc.dg/cpp/trad/comment-2.c b/gcc/testsuite/gcc.dg/cpp/trad/comment-2.c index 8d54e3a..310f569 100644 --- a/gcc/testsuite/gcc.dg/cpp/trad/comment-2.c +++ b/gcc/testsuite/gcc.dg/cpp/trad/comment-2.c @@ -8,4 +8,4 @@ /* - /* { dg-warning "within comment" } */ + /* { dg-warning "2: within comment" } */ diff --git a/gcc/testsuite/gcc.dg/cpp/warn-comments.c b/gcc/testsuite/gcc.dg/cpp/warn-comments.c index 1cdf75c..bbe2821 100644 --- a/gcc/testsuite/gcc.dg/cpp/warn-comments.c +++ b/gcc/testsuite/gcc.dg/cpp/warn-comments.c @@ -1,7 +1,7 @@ // { dg-do preprocess } // { dg-options "-std=gnu99 -fdiagnostics-show-option -Wcomments" } -/* /* */ // { dg-warning "\"\.\*\" within comment .-Wcomment." } +/* /* */ // { dg-warning "4: \"\.\*\" within comment .-Wcomment." } // \ - // { dg-warning "multi-line comment .-Wcomment." "multi-line" { target *-*-* } 6 } + // { dg-warning "1: multi-line comment .-Wcomment." "multi-line" { target *-*-* } 6 } |