[Bug c/80116] Warn about macros expanding to multiple statements

[mpolacek at gcc dot gnu.org]

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

--- Comment #5 from Marek Polacek <mpolacek at gcc dot gnu.org> ---
Author: mpolacek
Date: Mon Jun 26 10:02:27 2017
New Revision: 249643

URL: https://gcc.gnu.org/viewcvs?rev=249643&root=gcc&view=rev
Log:
        PR c/80116
        * c-common.h (warn_for_multistatement_macros): Declare.
        * c-warn.c: Include "c-family/c-indentation.h".
        (warn_for_multistatement_macros): New function.
        * c.opt (Wmultistatement-macros): New option.
        * c-indentation.c (guard_tinfo_to_string): No longer static.
        Change the parameter type to "enum rid".  Handle RID_SWITCH.
        * c-indentation.h (guard_tinfo_to_string): Declare.

        * c-parser.c (c_parser_if_body): Set the location of the
        body of the conditional after parsing all the labels.  Call
        warn_for_multistatement_macros.
        (c_parser_else_body): Likewise.
        (c_parser_switch_statement): Likewise.
        (c_parser_while_statement): Likewise.
        (c_parser_for_statement): Likewise.
        (c_parser_statement): Add a default argument.  Save the location
        after labels have been parsed.
        (c_parser_c99_block_statement): Likewise.

        * parser.c (cp_parser_statement): Add a default argument.  Save the
        location of the expression-statement after labels have been parsed.
        (cp_parser_implicitly_scoped_statement): Set the location of the
        body of the conditional after parsing all the labels.  Call
        warn_for_multistatement_macros.
        (cp_parser_already_scoped_statement): Likewise.

        * doc/invoke.texi: Document -Wmultistatement-macros.

        * c-c++-common/Wmultistatement-macros-1.c: New test.
        * c-c++-common/Wmultistatement-macros-2.c: New test.
        * c-c++-common/Wmultistatement-macros-3.c: New test.
        * c-c++-common/Wmultistatement-macros-4.c: New test.
        * c-c++-common/Wmultistatement-macros-5.c: New test.
        * c-c++-common/Wmultistatement-macros-6.c: New test.
        * c-c++-common/Wmultistatement-macros-7.c: New test.
        * c-c++-common/Wmultistatement-macros-8.c: New test.
        * c-c++-common/Wmultistatement-macros-9.c: New test.
        * c-c++-common/Wmultistatement-macros-10.c: New test.
        * c-c++-common/Wmultistatement-macros-11.c: New test.

Added:
    trunk/gcc/testsuite/c-c++-common/Wmultistatement-macros-1.c
    trunk/gcc/testsuite/c-c++-common/Wmultistatement-macros-10.c
    trunk/gcc/testsuite/c-c++-common/Wmultistatement-macros-11.c
    trunk/gcc/testsuite/c-c++-common/Wmultistatement-macros-2.c
    trunk/gcc/testsuite/c-c++-common/Wmultistatement-macros-3.c
    trunk/gcc/testsuite/c-c++-common/Wmultistatement-macros-4.c
    trunk/gcc/testsuite/c-c++-common/Wmultistatement-macros-5.c
    trunk/gcc/testsuite/c-c++-common/Wmultistatement-macros-6.c
    trunk/gcc/testsuite/c-c++-common/Wmultistatement-macros-7.c
    trunk/gcc/testsuite/c-c++-common/Wmultistatement-macros-8.c
    trunk/gcc/testsuite/c-c++-common/Wmultistatement-macros-9.c
Modified:
    trunk/gcc/ChangeLog
    trunk/gcc/c-family/ChangeLog
    trunk/gcc/c-family/c-common.h
    trunk/gcc/c-family/c-indentation.c
    trunk/gcc/c-family/c-indentation.h
    trunk/gcc/c-family/c-warn.c
    trunk/gcc/c-family/c.opt
    trunk/gcc/c/ChangeLog
    trunk/gcc/c/c-parser.c
    trunk/gcc/cp/ChangeLog
    trunk/gcc/cp/parser.c
    trunk/gcc/doc/invoke.texi
    trunk/gcc/testsuite/ChangeLog