From patchwork Sun Sep 12 18:12:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan-Benedict Glaw X-Patchwork-Id: 1526981 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4H6yQB5v3qz9sX3 for ; Mon, 13 Sep 2021 04:12:48 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A9B77385780A for ; Sun, 12 Sep 2021 18:12:43 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from lug-owl.de (lug-owl.de [IPv6:2a03:4000:10:469::]) by sourceware.org (Postfix) with ESMTP id 23CB33858D34 for ; Sun, 12 Sep 2021 18:12:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 23CB33858D34 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=lug-owl.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=lug-owl.de Received: by lug-owl.de (Postfix, from userid 1001) id DFEE941EFC; Sun, 12 Sep 2021 20:12:18 +0200 (CEST) Date: Sun, 12 Sep 2021 20:12:18 +0200 From: Jan-Benedict Glaw To: Douglas Rupp , Tristan Gingold Subject: [PATCH] Fix multi-statement define for alpha-dec-vms Message-ID: <20210912181218.2um4x2netru3kigg@lug-owl.de> MIME-Version: 1.0 Content-Disposition: inline X-Operating-System: Linux chamaeleon 5.8.0-0.bpo.2-amd64 X-gpg-fingerprint: 250D 3BCF 7127 0D8C A444 A961 1DBD 5E75 8399 E1BB X-gpg-key: wwwkeys.de.pgp.net X-Echelon-Enable: howto poison arsenous mail psychological biological nuclear warfare test the bombastical terror of flooding the spy listeners explosion sex drugs and rock'n'roll X-TKUeV: howto poison arsenous mail psychological biological nuclear warfare test the bombastical terror of flooding the spy listeners explosion sex drugs and rock'n'roll X-message-flag: Please send plain text messages only. Do not send HTML emails. Thank you. User-Agent: NeoMutt/20170113 (1.7.2) X-Spam-Status: No, score=-8.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: GCC Patches Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Hi! While mass-building a cross-gcc, I noticed that for alpha-dec-vms/alpha64-dec-vms, recent GCC versions correctly throw a warning due to a multi-statement define that gets rippen in an if/else case: [all 2021-09-12 15:51:55] /usr/lib/gcc-snapshot/bin/g++ -fno-PIE -c -g -O2 -DIN_GCC -DCROSS_DIRECTORY_STRUCTURE -fno-exceptions -fno-rtti -fasynchronous-unwind-tables -W -Wall -Wno-narrowing -Wwrite-strings -Wcast-qual -Wno-error=format-diag -Wmissing-format-attribute -Woverloaded-virtual -pedantic -Wno-long-long -Wno-variadic-macros -Wno-overlength-strings -Werror -fno-common -DHAVE_CONFIG_H -I. -I. -I../../gcc/gcc -I../../gcc/gcc/. -I../../gcc/gcc/../include -I../../gcc/gcc/../libcpp/include -I../../gcc/gcc/../libcody -I../../gcc/gcc/../libdecnumber -I../../gcc/gcc/../libdecnumber/dpd -I../libdecnumber -I../../gcc/gcc/../libbacktrace -o value-prof.o -MT value-prof.o -MMD -MP -MF ./.deps/value-prof.TPo ../../gcc/gcc/value-prof.c [all 2021-09-12 15:52:01] /usr/lib/gcc-snapshot/bin/g++ -fno-PIE -c -g -O2 -DIN_GCC -DCROSS_DIRECTORY_STRUCTURE -fno-exceptions -fno-rtti -fasynchronous-unwind-tables -W -Wall -Wno-narrowing -Wwrite-strings -Wcast-qual -Wno-error=format-diag -Wmissing-format-attribute -Woverloaded-virtual -pedantic -Wno-long-long -Wno-variadic-macros -Wno-overlength-strings -Werror -fno-common -DHAVE_CONFIG_H -I. -I. -I../../gcc/gcc -I../../gcc/gcc/. -I../../gcc/gcc/../include -I../../gcc/gcc/../libcpp/include -I../../gcc/gcc/../libcody -I../../gcc/gcc/../libdecnumber -I../../gcc/gcc/../libdecnumber/dpd -I../libdecnumber -I../../gcc/gcc/../libbacktrace -o var-tracking.o -MT var-tracking.o -MMD -MP -MF ./.deps/var-tracking.TPo ../../gcc/gcc/var-tracking.c [all 2021-09-12 15:52:03] In file included from ./tm.h:21, [all 2021-09-12 15:52:03] from ../../gcc/gcc/backend.h:28, [all 2021-09-12 15:52:03] from ../../gcc/gcc/var-tracking.c:91: [all 2021-09-12 15:52:03] ../../gcc/gcc/var-tracking.c: In function 'void prepare_call_arguments(basic_block, rtx_insn*)': [all 2021-09-12 15:52:03] ../../gcc/gcc/config/alpha/vms.h:148:3: error: macro expands to multiple statements [-Werror=multistatement-macros] [all 2021-09-12 15:52:03] 148 | (CUM).num_args = 0; \ [all 2021-09-12 15:52:03] | ^ [all 2021-09-12 15:52:03] ../../gcc/gcc/var-tracking.c:6334:17: note: in expansion of macro 'INIT_CUMULATIVE_ARGS' [all 2021-09-12 15:52:03] 6334 | INIT_CUMULATIVE_ARGS (args_so_far_v, type, NULL_RTX, fndecl, [all 2021-09-12 15:52:03] | ^~~~~~~~~~~~~~~~~~~~ [all 2021-09-12 15:52:03] ../../gcc/gcc/var-tracking.c:6332:15: note: some parts of macro expansion are not guarded by this 'else' clause [all 2021-09-12 15:52:03] 6332 | else [all 2021-09-12 15:52:03] | ^~~~ [all 2021-09-12 15:52:20] cc1plus: all warnings being treated as errors [all 2021-09-12 15:52:20] make[1]: *** [Makefile:1143: var-tracking.o] Error 1 [all 2021-09-12 15:52:20] make[1]: Leaving directory '/var/lib/laminar/run/gcc-alpha64-dec-vms/8/toolchain-build/gcc' [all 2021-09-12 15:52:20] make: *** [Makefile:4425: all-gcc] Error 2 gcc/ChangeLog: * config/alpha/vms.h (INIT_CUMULATIVE_ARGS): Wrap multi-statment define into a block. Okay for trunk? Thanks, Jan-Benedict diff --git a/gcc/config/alpha/vms.h b/gcc/config/alpha/vms.h index b8673b6b6fb..e979aef10c7 100644 --- a/gcc/config/alpha/vms.h +++ b/gcc/config/alpha/vms.h @@ -145,9 +145,13 @@ typedef struct {int num_args; enum avms_arg_type atypes[6];} avms_arg_info; #undef INIT_CUMULATIVE_ARGS #define INIT_CUMULATIVE_ARGS(CUM, FNTYPE, LIBNAME, INDIRECT, N_NAMED_ARGS) \ - (CUM).num_args = 0; \ - (CUM).atypes[0] = (CUM).atypes[1] = (CUM).atypes[2] = I64; \ - (CUM).atypes[3] = (CUM).atypes[4] = (CUM).atypes[5] = I64; + do \ + { \ + (CUM).num_args = 0; \ + (CUM).atypes[0] = (CUM).atypes[1] = (CUM).atypes[2] = I64; \ + (CUM).atypes[3] = (CUM).atypes[4] = (CUM).atypes[5] = I64; \ + } \ + while (0) #define DEFAULT_PCC_STRUCT_RETURN 0