OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
David Malcolm 2016-02-08 17:33:45 +00:00 committed by David Malcolm
parent f258ad62e3
commit 44714d8ce1
6 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/testsuite/ChangeLog
View File

@ -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

2
gcc/testsuite/gcc.dg/cpp/trad/comment-2.c
View File

@ -8,4 +8,4 @@
/*
/* { dg-warning "within comment" } */
/* { dg-warning "2: within comment" } */

4
gcc/testsuite/gcc.dg/cpp/warn-comments.c
View File

@ -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 }

9
libcpp/ChangeLog
View File

@ -1,3 +1,12 @@
2016-02-08 David Malcolm <dmalcolm@redhat.com>
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.
2016-02-05 Jakub Jelinek <jakub@redhat.com>
PR c++/69628

3
libcpp/errors.c
View File

@ -141,7 +141,8 @@ cpp_diagnostic_with_line (cpp_reader * pfile, int level, int reason,
if (!pfile->cb.error)
abort ();
rich_location richloc (pfile->line_table, src_loc);
richloc.override_column (column);
if (column)
richloc.override_column (column);
ret = pfile->cb.error (pfile, level, reason, &richloc, _(msgid), ap);
return ret;

11
libcpp/line-map.c
View File

@ -2036,13 +2036,22 @@ rich_location::lazily_expand_location ()
return m_expanded_location;
}
/* Set the column of the primary location. */
/* Set the column of the primary location. This can only be called for
rich_location instances for which the primary location has
caret==start==finish. */
void
rich_location::override_column (int column)
{
lazily_expand_location ();
gcc_assert (m_ranges[0].m_show_caret_p);
gcc_assert (m_ranges[0].m_caret.column == m_expanded_location.column);
gcc_assert (m_ranges[0].m_start.column == m_expanded_location.column);
gcc_assert (m_ranges[0].m_finish.column == m_expanded_location.column);
m_expanded_location.column = column;
m_ranges[0].m_caret.column = column;
m_ranges[0].m_start.column = column;
m_ranges[0].m_finish.column = column;
}
/* Add the given range. */