This is the mail archive of the
gcc-cvs@gcc.gnu.org
mailing list for the GCC project.
r190269 - in /branches/google/gcc-4_7/gcc: Chan...
- From: ccoutant at gcc dot gnu dot org
- To: gcc-cvs at gcc dot gnu dot org
- Date: Thu, 09 Aug 2012 22:24:25 -0000
- Subject: r190269 - in /branches/google/gcc-4_7/gcc: Chan...
Author: ccoutant
Date: Thu Aug 9 22:24:24 2012
New Revision: 190269
URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=190269
Log:
This patch is for the google/main and google/gcc-4_7 branches.
New code in GCC 4.7 is calling linemap_lookup with a location_t that
may still represent a location-with-discriminator. Before using a
location_t value to lookup the line number, it needs to be mapped to
a real location_t value.
Tested with make check-gcc and validate-failures.py.
2012-08-09 Cary Coutant <ccoutant@google.com>
gcc/
* tree-diagnostic.c (maybe_unwind_expanded_macro_loc): Check for
discriminator.
* diagnostic.c (diagnostic_report_current_module): Likewise.
Modified:
branches/google/gcc-4_7/gcc/ChangeLog.google-4_7
branches/google/gcc-4_7/gcc/diagnostic.c
branches/google/gcc-4_7/gcc/tree-diagnostic.c