[Bug c/80076] -Wmisleading-indentation doesn't trigger when macro is misindented

[cvs-commit at gcc dot gnu.org]

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

--- Comment #2 from CVS Commits <cvs-commit at gcc dot gnu.org> ---
The master branch has been updated by Patrick Palka <ppa...@gcc.gnu.org>:

https://gcc.gnu.org/g:4839de55e2c98619f4919254abb87e2f393aaead

commit r11-3266-g4839de55e2c98619f4919254abb87e2f393aaead
Author: Patrick Palka <ppa...@redhat.com>
Date:   Thu Sep 17 14:27:22 2020 -0400

    c-family: Macro support in -Wmisleading-indentation [PR80076]

    Currently the -Wmisleading-indentation warning doesn't do any analysis
    when the guarded statement or the statement after it is produced by a
    macro.  This means we warn for:

      if (flag)
        foo ();
        bar ();

    but not for:

      #define BAR bar
      if (flag)
        foo ();
        BAR ();

    This patch extends the -Wmisleading-indentation implementation to
    support analyzing such statements and their tokens.  This is done in the
    "natural" way by resolving the location of each of the three tokens to
    the token's macro expansion point.  (Additionally, if the tokens all
    resolve to the same macro expansion point then we instead use their
    locations within the macro definition.)  When these resolved locations
    are all different, then we can proceed with applying the warning
    heuristics to them as if no macros were involved.

    gcc/c-family/ChangeLog:

            PR c/80076
            * c-indentation.c (should_warn_for_misleading_indentation): Move
            declarations of local variables closer to their first use.
            Handle virtual token locations by resolving them to their
            respective macro expansion points.  If all three tokens are
            produced from the same macro expansion, then instead use their
            loci within the macro definition.

    gcc/objc/ChangeLog:

            PR c/80076
            * objc-gnu-runtime-abi-01.c
            (gnu_runtime_abi_01_get_class_super_ref): Reduce indentation of
            misleadingly indented return statements.
            * objc-next-runtime-abi-01.c
            (next_runtime_abi_01_get_class_super_ref): Likewise.

    gcc/ChangeLog:

            PR c/80076
            * gensupport.c (alter_attrs_for_subst_insn) <case SET_ATTR>:
            Reduce indentation of misleadingly indented code fragment.
            * lra-constraints.c (multi_block_pseudo_p): Likewise.
            * sel-sched-ir.c (merge_fences): Likewise.

    libcpp/ChangeLog:

            PR c/80076
            * include/line-map.h (first_map_in_common): Declare.
            * line-map.c (first_map_in_common): Remove static.

    gcc/testsuite/ChangeLog:

            PR c/80076
            * c-c++-common/Wmisleading-indentation-5.c: New test.