[Bug c/107002] [13 Regression] ICE in column_range, at diagnostic-show-locus.cc:2236 since r13-2386-gbedfca647a9e9c1a

["cvs-commit at gcc dot gnu.org" <gcc-bugzilla@gcc.gnu.org>]

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

--- Comment #5 from CVS Commits <cvs-commit at gcc dot gnu.org> ---
The master branch has been updated by David Malcolm <dmalcolm@gcc.gnu.org>:

https://gcc.gnu.org/g:22c3a6c3c118283dfef1b9928dd21110098679b7

commit r13-6912-g22c3a6c3c118283dfef1b9928dd21110098679b7
Author: David Malcolm <dmalcolm@redhat.com>
Date:   Tue Mar 28 14:34:49 2023 -0400

    Don't emit -Wxor-used-as-pow on macro expansions [PR107002]

    PR c/107002 reports an assertion failure from deep inside the
    diagnostic_shows_locus when attempting to print fix-it hints relating
    to -Wxor-used-as-pow.  The case involves macro expansions with
    -ftrack-macro-expansion=0.

    It doesn't seem to make much sense to emit this warning for macro
    expansions, so this patch updates the warning not to (which seems
    to also be clang's behavior).  The patch also adds some bulletproofing
    to diagnostic-show-locus.cc to be more robust against such invalid
    fix-it hints.

    Doing so fixes the ICE.

    gcc/c-family/ChangeLog:
            PR c/107002
            * c-common.h (check_for_xor_used_as_pow): Add "rhs_loc" param.
            * c-warn.cc (check_for_xor_used_as_pow): Add "rhs_loc" param.
            Reject cases where involving macro expansions.

    gcc/c/ChangeLog:
            PR c/107002
            * c-typeck.cc (parser_build_binary_op): Update for new param of
            check_for_xor_used_as_pow.

    gcc/cp/ChangeLog:
            PR c/107002
            * parser.cc (cp_parser_binary_expression): Update for new param of
            check_for_xor_used_as_pow.

    gcc/ChangeLog:
            PR c/107002
            * diagnostic-show-locus.cc (column_range::column_range): Factor
            out assertion conditional into...
            (column_range::valid_p): ...this new function.
            (line_corrections::add_hint): Don't attempt to consolidate hints
            if it would lead to invalid column_range instances.

    gcc/testsuite/ChangeLog:
            PR c/107002
            * c-c++-common/Wxor-used-as-pow-1.c: Add macro test.
            * c-c++-common/Wxor-used-as-pow-pr107002-0.c: New test.
            * c-c++-common/Wxor-used-as-pow-pr107002-1.c: New test.
            * c-c++-common/Wxor-used-as-pow-pr107002-2.c: New test.

    Signed-off-by: David Malcolm <dmalcolm@redhat.com>