[Bug preprocessor/69985] [6 Regression] ICE: in linemap_position_for_loc_and_offset, at libcpp/line-map.c:924

[dmalcolm at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69985

--- Comment #21 from David Malcolm <dmalcolm at gcc dot gnu.org> ---
Author: dmalcolm
Date: Tue Mar  1 01:02:49 2016
New Revision: 233836

URL: https://gcc.gnu.org/viewcvs?rev=233836&root=gcc&view=rev
Log:
PR preprocessor/69985: fix ICE with long lines in -Wformat

gcc/testsuite/ChangeLog:
        PR preprocessor/69985
        * gcc.dg/cpp/pr69985.c: New test case.

libcpp/ChangeLog:
        PR preprocessor/69985
        (linemap_position_for_loc_and_offset): Rename param from "offset"
        to "column_offset".  Right-shift the column_offset by m_range_bits
        of the pertinent ordinary map whenever offsetting a
        source_location.  For clarity, offset the column by the column
        offset, rather than the other way around.


Added:
    trunk/gcc/testsuite/gcc.dg/cpp/pr69985.c
Modified:
    trunk/gcc/testsuite/ChangeLog
    trunk/libcpp/ChangeLog
    trunk/libcpp/line-map.c