From patchwork Tue Feb 20 04:35:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alexandre Oliva X-Patchwork-Id: 203409 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp189939dyc; Mon, 19 Feb 2024 20:37:18 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCU0B4zoDKXrPo1tNCDgVPQ6V1D+MW8RSgKA/RLWmBGl5qV9qEjcSvaELcGT2+ONUuUURdIB6qrPVzNCpBdkPgbfuIy57A== X-Google-Smtp-Source: AGHT+IGwSwGbeqo67k3SILUkTW6gQIG+6S3UxgDZNExlPCfhYhFzO+eZtmAYptX4tswMeXR83RBY X-Received: by 2002:a05:6214:4001:b0:68f:5ac3:8af3 with SMTP id kd1-20020a056214400100b0068f5ac38af3mr7316172qvb.22.1708403838436; Mon, 19 Feb 2024 20:37:18 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708403838; cv=pass; d=google.com; s=arc-20160816; b=oDjrtPtDZVYcl+vLmO0ZFGeJz0g9O/rrejE77Jhwp77XDYMw304euGpoRpyJ10QpMx gHFPpRNlwvOKKTtTWvNUko/R0Ecvz5WPBqp3wouMAop7Q05Uy7dv/Kl4HCtfp/X5eioj MDePaOMaiqXdnR5SAk9jy/jIotiRU5c6K4WwpE8s5queSKCdHigtsM5hr5zL0mepK78K HcJ013oTckXYrcLpKxRdjti1GY4yE0UyDQmDeroNoUpYbu511/ZHvyNgnrLN+BfwG9tk 16JOBHi5iYrBwCxGJHwr+9thcRqoltBHa+6RGnDg0rS2YSDF96ieXX7Ewy2rIEBEIYuD YVOg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:user-agent:organization:subject:cc:to :from:dkim-signature:arc-filter:dmarc-filter:delivered-to; bh=cOsG2jpaR1cXXBSohEBJZflcmwK2tUfA2aQs2b0//uU=; fh=KILJynHdSxiLbcMMFGxUctM6qRyLaKZhLr285u4Fngc=; b=y8xOhd7BwL0/Jq0GcfI4CBZ962ueWr3oOf9eKbSGO9YoEfkfuPKTt8/vQ61B1ATskR 7oKLipCvFq4COppo3IEfVWmfeBw6T2fsJpFuTgsPnSq8olzurGO52IChFjWcevHgDRhG rTwO9NuXjlqpW1GdgIpGsnQ0BpU0CqWW8NyiZDMZlCNiqk/OVYga0QzkQtxi0E3YaoTQ SDTwL9BQODDmY6IbC0Y839GhjnLIFs+Dpgc9JaEmN7cUpSm0ulvjMBveZdLdc0u3nLqK sgePzZ7JlCToarNpm160yPCxPUWjimQ7bsC7gqc/vdtrBDUql0zV0ovxm42eG45Qlnte Hzrg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@adacore.com header.s=google header.b=YpBjQNDp; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=adacore.com Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id fv3-20020a056214240300b0068f6a20d861si4224373qvb.158.2024.02.19.20.37.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Feb 2024 20:37:18 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@adacore.com header.s=google header.b=YpBjQNDp; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=adacore.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 10CF03858C78 for ; Tue, 20 Feb 2024 04:37:18 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com [IPv6:2607:f8b0:4864:20::1032]) by sourceware.org (Postfix) with ESMTPS id 7D47C3858D1E for ; Tue, 20 Feb 2024 04:36:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7D47C3858D1E Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 7D47C3858D1E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::1032 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708403795; cv=none; b=Zm0TokpJhIbnV4jHljtIE7L5eXZ1bFUYv8mI4ZuuklqN9fDe1rNezfkyCZan+nBL3YJzdVNGvZ4pOsKtvjC8HNAolG54vR2FIwZeBeKczr/lWcuJXC6MWWy9DTEC1ssJsejq96/a1OO+QGIT4sw3bGoyB5pJUJtT8sapGJ0Jjno= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708403795; c=relaxed/simple; bh=uGpdGDToxAhpMOqMy4AVbAj7v62JDtHw76fGdsfwSjE=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=vwGYmRWSC3qneYXzF1k3dglhqUBGDYVSbZhCV5bTSInEmpQtNE0r6OrbDLgrooAb3e3SwA1awTQfzIdFV6ALOP0A3wBd8z0Zlx6E2aXPe708pLob6gPJwpMsMHuCt3q9RPBsW+ouJpyLNC3FmUde2Jxw8cxkJGIEG6+Ykap5nmg= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pj1-x1032.google.com with SMTP id 98e67ed59e1d1-299b55f2344so952603a91.2 for ; Mon, 19 Feb 2024 20:36:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1708403788; x=1709008588; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:user-agent :organization:subject:cc:to:from:from:to:cc:subject:date:message-id :reply-to; bh=cOsG2jpaR1cXXBSohEBJZflcmwK2tUfA2aQs2b0//uU=; b=YpBjQNDpHrlWEuy0+4KOpQ1AtkjJMDp6OVJNOzH7XFYeKdir7BGNDfti+Z7NROO1KG xbYJDQdnvuoH4ZdZoVJf4euW/4v1aUZmshkz4r9OriD7THtJG/FifPeY3HtRJnaqVB5/ 52RgEYoqYOHs8/9qjrdr7g4sRRolDkcY+ZwwSqiQEljDi/YzkKg2/6DWSEqzxw6tutbH F6K4Hf39/GHYw1aQ6NnZH+7xOPcsl26S1E+eree7+0+e2jUhqewv1q4L37ZG61E09HPR sRgpyW2johKk+zbbwsNIKn+sdL9vXhd/l6yGuY7bLHBaAiGXEgE/9y9dl7RQ9TDo9O3U FnIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708403788; x=1709008588; h=content-transfer-encoding:mime-version:message-id:date:user-agent :organization:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cOsG2jpaR1cXXBSohEBJZflcmwK2tUfA2aQs2b0//uU=; b=L9OUeNtSY/p0Szse6TdAccLHJtoWqMTmSAqlEEqluskdxRnGTXcm/PjBYNZfhtoscC 6fQ11oCfbJ35HLHgu8Kag4301Mu2Nyvf4RUSRKMuMbRIaGMsiZM6uI9SNocBGvhI5ohP 1darUFHj/+6X024JGkXO0fbOQnLDzAkWDBGyRvqluV8vfpp38393/ayjh7MxfiF7Gufq NgquYEZb9B6PKOUdjK7WAT5tYUWklczUWD2MJbNzjG8CW2P+/AUJyEbmGIYaj85k+KSr +qifvGKpYgJbNqbgpw/kvQBVuXqRG//W87nFcQnKw3LiCnWHLZ3Fa8Evz9Kc7cHEKAGt PJjA== X-Gm-Message-State: AOJu0Yx5ZVKtaonq0BxYUQF+QmZNK9Lg4/rprJzTVFQPc1wDxfLlFhW/ H30dBEP0Pz+ClxLwpGb3hochRZMqPgTpwoH0ddg5MUmWvG4d2VE7Vk4vtG+BQre9hOVnzBXKXpe wMA== X-Received: by 2002:a17:90b:1fc8:b0:299:d43b:9092 with SMTP id st8-20020a17090b1fc800b00299d43b9092mr1601939pjb.15.1708403787775; Mon, 19 Feb 2024 20:36:27 -0800 (PST) Received: from free.home ([2804:7f1:218a:c88b:e868:4eaf:8258:c30b]) by smtp.gmail.com with ESMTPSA id r8-20020a17090ad40800b00299db19a81asm577644pju.56.2024.02.19.20.36.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Feb 2024 20:36:27 -0800 (PST) Received: from livre (livre.home [172.31.160.2]) by free.home (8.15.2/8.15.2) with ESMTPS id 41K4ZuvV006267 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 20 Feb 2024 01:35:56 -0300 From: Alexandre Oliva To: gcc-patches@gcc.gnu.org Cc: Per Bothner , David Malcolm , Lewis Hyatt Subject: [PATCH] libcpp: Improve location for macro names [PR66290] Organization: Free thinker, does not speak for AdaCore User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) Date: Tue, 20 Feb 2024 01:35:56 -0300 Message-ID: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791391263201161467 X-GMAIL-MSGID: 1791391263201161467 This backport for gcc-13 is the first of two required for the g++.dg/pch/line-map-3.C test to stop hitting a variant of the known problem mentioned in that testcase: on riscv64-elf and riscv32-elf, after restoring the PCH, the location of the macros is mentioned as if they were on line 3 rather than 2, so even the existing xfails fail. I think this might be too much to backport, and I'm ready to use an xfail instead, but since this would bring more predictability, I thought I'd ask whether you'd find this backport acceptable. Regstrapped on x86_64-linux-gnu, along with other backports, and tested manually on riscv64-elf. Ok to install? From: Lewis Hyatt When libcpp reports diagnostics whose locus is a macro name (such as for -Wunused-macros), it uses the location in the cpp_macro object that was stored by _cpp_new_macro. This is currently set to pfile->directive_line, which contains the line number only and no column information. This patch changes the stored location to the src_loc for the token defining the macro name, which includes the location and range information. libcpp/ChangeLog: PR c++/66290 * macro.cc (_cpp_create_definition): Add location argument. * internal.h (_cpp_create_definition): Adjust prototype. * directives.cc (do_define): Pass new location argument to _cpp_create_definition. (do_undef): Stop passing inferior location to cpp_warning_with_line; the default from cpp_warning is better. (cpp_pop_definition): Pass new location argument to _cpp_create_definition. * pch.cc (cpp_read_state): Likewise. gcc/testsuite/ChangeLog: PR c++/66290 * c-c++-common/cpp/macro-ranges.c: New test. * c-c++-common/cpp/line-2.c: Adapt to check for column information on macro-related libcpp warnings. * c-c++-common/cpp/line-3.c: Likewise. * c-c++-common/cpp/macro-arg-count-1.c: Likewise. * c-c++-common/cpp/pr58844-1.c: Likewise. * c-c++-common/cpp/pr58844-2.c: Likewise. * c-c++-common/cpp/warning-zero-location.c: Likewise. * c-c++-common/pragma-diag-14.c: Likewise. * c-c++-common/pragma-diag-15.c: Likewise. * g++.dg/modules/macro-2_d.C: Likewise. * g++.dg/modules/macro-4_d.C: Likewise. * g++.dg/modules/macro-4_e.C: Likewise. * g++.dg/spellcheck-macro-ordering.C: Likewise. * gcc.dg/builtin-redefine.c: Likewise. * gcc.dg/cpp/Wunused.c: Likewise. * gcc.dg/cpp/redef2.c: Likewise. * gcc.dg/cpp/redef3.c: Likewise. * gcc.dg/cpp/redef4.c: Likewise. * gcc.dg/cpp/ucnid-11-utf8.c: Likewise. * gcc.dg/cpp/ucnid-11.c: Likewise. * gcc.dg/cpp/undef2.c: Likewise. * gcc.dg/cpp/warn-redefined-2.c: Likewise. * gcc.dg/cpp/warn-redefined.c: Likewise. * gcc.dg/cpp/warn-unused-macros-2.c: Likewise. * gcc.dg/cpp/warn-unused-macros.c: Likewise. (cherry picked from commit 4f3be7cbebce8ec9e0c5d9340b2772581454b862) --- gcc/testsuite/c-c++-common/cpp/line-2.c | 2 gcc/testsuite/c-c++-common/cpp/line-3.c | 2 gcc/testsuite/c-c++-common/cpp/macro-arg-count-1.c | 4 gcc/testsuite/c-c++-common/cpp/macro-ranges.c | 52 ++ gcc/testsuite/c-c++-common/cpp/pr58844-1.c | 4 gcc/testsuite/c-c++-common/cpp/pr58844-2.c | 4 .../c-c++-common/cpp/warning-zero-location.c | 2 gcc/testsuite/c-c++-common/pragma-diag-14.c | 2 gcc/testsuite/c-c++-common/pragma-diag-15.c | 2 gcc/testsuite/g++.dg/modules/macro-2_d.C | 4 gcc/testsuite/g++.dg/modules/macro-4_d.C | 4 gcc/testsuite/g++.dg/modules/macro-4_e.C | 2 gcc/testsuite/g++.dg/spellcheck-macro-ordering.C | 2 gcc/testsuite/gcc.dg/builtin-redefine.c | 18 - gcc/testsuite/gcc.dg/cpp/Wunused.c | 6 gcc/testsuite/gcc.dg/cpp/redef2.c | 20 - gcc/testsuite/gcc.dg/cpp/redef3.c | 14 - gcc/testsuite/gcc.dg/cpp/redef4.c | 520 ++++++++++---------- gcc/testsuite/gcc.dg/cpp/ucnid-11-utf8.c | 12 gcc/testsuite/gcc.dg/cpp/ucnid-11.c | 12 gcc/testsuite/gcc.dg/cpp/undef2.c | 6 gcc/testsuite/gcc.dg/cpp/warn-redefined-2.c | 10 gcc/testsuite/gcc.dg/cpp/warn-redefined.c | 10 gcc/testsuite/gcc.dg/cpp/warn-unused-macros-2.c | 2 gcc/testsuite/gcc.dg/cpp/warn-unused-macros.c | 2 libcpp/directives.cc | 13 - libcpp/internal.h | 2 libcpp/macro.cc | 12 libcpp/pch.cc | 2 29 files changed, 405 insertions(+), 342 deletions(-) create mode 100644 gcc/testsuite/c-c++-common/cpp/macro-ranges.c diff --git a/gcc/testsuite/c-c++-common/cpp/line-2.c b/gcc/testsuite/c-c++-common/cpp/line-2.c index 364ad0e393188..3ce2334087100 100644 --- a/gcc/testsuite/c-c++-common/cpp/line-2.c +++ b/gcc/testsuite/c-c++-common/cpp/line-2.c @@ -8,4 +8,4 @@ int line4; // { dg-regexp {In file included from :\n[^\n]*/line-2.h:4:2: error: #error wrong\n} } -// { dg-regexp {[^\n]*/line-2.c:3:11: error: macro "bill" passed 1 arguments, but takes just 0\n[^\n]*/line-2.h:3: note: macro "bill" defined here\n} } +// { dg-regexp {[^\n]*/line-2.c:3:11: error: macro "bill" passed 1 arguments, but takes just 0\n[^\n]*/line-2.h:3:9: note: macro "bill" defined here\n} } diff --git a/gcc/testsuite/c-c++-common/cpp/line-3.c b/gcc/testsuite/c-c++-common/cpp/line-3.c index b254ae400419c..b067292375608 100644 --- a/gcc/testsuite/c-c++-common/cpp/line-3.c +++ b/gcc/testsuite/c-c++-common/cpp/line-3.c @@ -15,6 +15,6 @@ int line4; // { dg-regexp {In file included from :\n[^\n]*/line-2.h:4:2: error: #error wrong\n} } -// { dg-regexp {[^\n]*/line-3.c:3:11: error: macro "bill" passed 1 arguments, but takes just 0\n[^\n]*/line-2.h:3: note: macro "bill" defined here\n} } +// { dg-regexp {[^\n]*/line-3.c:3:11: error: macro "bill" passed 1 arguments, but takes just 0\n[^\n]*/line-2.h:3:9: note: macro "bill" defined here\n} } // { dg-options "-fpreprocessed -fdirectives-only" } diff --git a/gcc/testsuite/c-c++-common/cpp/macro-arg-count-1.c b/gcc/testsuite/c-c++-common/cpp/macro-arg-count-1.c index 7773c47e76520..103e88ecd4dd7 100644 --- a/gcc/testsuite/c-c++-common/cpp/macro-arg-count-1.c +++ b/gcc/testsuite/c-c++-common/cpp/macro-arg-count-1.c @@ -9,7 +9,7 @@ void test_1 () MACRO_1(42); ^ { dg-end-multiline-output "" } */ - /* { dg-message "-: macro .MACRO_1. defined here" "" { target *-*-* } def_of_MACRO_1 } + /* { dg-message "macro .MACRO_1. defined here" "" { target *-*-* } def_of_MACRO_1 } /* { dg-begin-multiline-output "" } #define MACRO_1(X,Y) @@ -33,7 +33,7 @@ void test_2 () MACRO_2(1, 2, 3); ^ { dg-end-multiline-output "" } */ - /* { dg-message "-: macro .MACRO_2. defined here" "" { target *-*-* } def_of_MACRO_2 } + /* { dg-message "macro .MACRO_2. defined here" "" { target *-*-* } def_of_MACRO_2 } /* { dg-begin-multiline-output "" } #define MACRO_2(X,Y) diff --git a/gcc/testsuite/c-c++-common/cpp/macro-ranges.c b/gcc/testsuite/c-c++-common/cpp/macro-ranges.c new file mode 100644 index 0000000000000..72b026f85c0a0 --- /dev/null +++ b/gcc/testsuite/c-c++-common/cpp/macro-ranges.c @@ -0,0 +1,52 @@ +/* { dg-do preprocess } */ +/* { dg-additional-options "-fdiagnostics-show-caret -Wunused-macros -Wbuiltin-macro-redefined" } */ + +/* Verify that we output range information for diagnostics involving + macro definitions. */ + +#undef __TIME__ /* { dg-warning {undefining "__TIME__"} } */ +/* { dg-begin-multiline-output "" } + #undef __TIME__ + ^~~~~~~~ +/* { dg-end-multiline-output "" } */ + +#define XYZ 123 /* { dg-warning {macro "XYZ" is not used} } */ +/* { dg-begin-multiline-output "" } + #define XYZ 123 + ^~~ +/* { dg-end-multiline-output "" } */ + +#define MACRO initial_definition /* { dg-line def_line } */ + +/* This locus is output first for the unused warning... */ +/* { dg-warning {macro "MACRO" is not used} "" { target *-*-* } def_line } */ +/* { dg-begin-multiline-output "" } + #define MACRO initial_definition + ^~~~~ +/* { dg-end-multiline-output "" } */ + +/* ...then a second time for the redefinition warning. */ +/* { dg-note {this is the location of the previous definition} "" { target *-*-* } def_line } */ +/* { dg-begin-multiline-output "" } + #define MACRO initial_definition + ^~~~~ +/* { dg-end-multiline-output "" } */ + +#define MACRO /* { dg-warning {"MACRO" redefined} } */ +/* { dg-begin-multiline-output "" } + #define MACRO + ^~~~~ +{ dg-end-multiline-output "" } */ + +#define MACRO2(x,y) x /* { dg-note {macro "MACRO2" defined here} } */ +/* { dg-begin-multiline-output "" } + #define MACRO2(x,y) + ^~~~~~ +{ dg-end-multiline-output "" } */ + +MACRO2(MACRO, MACRO) +MACRO2(MACRO) /* { dg-error {macro "MACRO2" requires 2 arguments, but only 1 given} } */ +/* { dg-begin-multiline-output "" } + MACRO2(MACRO) + ^ +{ dg-end-multiline-output "" } */ diff --git a/gcc/testsuite/c-c++-common/cpp/pr58844-1.c b/gcc/testsuite/c-c++-common/cpp/pr58844-1.c index 2a2e277b0fcbc..3abf8a768035a 100644 --- a/gcc/testsuite/c-c++-common/cpp/pr58844-1.c +++ b/gcc/testsuite/c-c++-common/cpp/pr58844-1.c @@ -4,5 +4,5 @@ #define A x######x int A = 1; -#define A x######x /* { dg-message "-:previous definition" } */ -#define A x##x /* { dg-warning "-:redefined" } */ +#define A x######x /* { dg-message "previous definition" } */ +#define A x##x /* { dg-warning "redefined" } */ diff --git a/gcc/testsuite/c-c++-common/cpp/pr58844-2.c b/gcc/testsuite/c-c++-common/cpp/pr58844-2.c index 52993b314be95..1e219152fc5d7 100644 --- a/gcc/testsuite/c-c++-common/cpp/pr58844-2.c +++ b/gcc/testsuite/c-c++-common/cpp/pr58844-2.c @@ -4,5 +4,5 @@ #define A x######x int A = 1; -#define A x######x /* { dg-message "-:previous definition" } */ -#define A x##x /* { dg-warning "-:redefined" } */ +#define A x######x /* { dg-message "previous definition" } */ +#define A x##x /* { dg-warning "redefined" } */ diff --git a/gcc/testsuite/c-c++-common/cpp/warning-zero-location.c b/gcc/testsuite/c-c++-common/cpp/warning-zero-location.c index 57544b6aff13b..2b9c9a9521715 100644 --- a/gcc/testsuite/c-c++-common/cpp/warning-zero-location.c +++ b/gcc/testsuite/c-c++-common/cpp/warning-zero-location.c @@ -3,6 +3,6 @@ { dg-do compile } */ -#define _GNU_SOURCE /* { dg-warning "-:redefined" } */ +#define _GNU_SOURCE /* { dg-warning "redefined" } */ /* { dg-message "" "#define _GNU_SOURCE" {target *-*-* } 0 } */ diff --git a/gcc/testsuite/c-c++-common/pragma-diag-14.c b/gcc/testsuite/c-c++-common/pragma-diag-14.c index 618e7e1ef274e..45dc4a38c5c03 100644 --- a/gcc/testsuite/c-c++-common/pragma-diag-14.c +++ b/gcc/testsuite/c-c++-common/pragma-diag-14.c @@ -5,5 +5,5 @@ location was not tracked properly with -E or -save-temps; check that it works now. */ -#define X /* { dg-warning "-:-Wunused-macros" } */ +#define X /* { dg-warning "-Wunused-macros" } */ #pragma GCC diagnostic ignored "-Wunused-macros" diff --git a/gcc/testsuite/c-c++-common/pragma-diag-15.c b/gcc/testsuite/c-c++-common/pragma-diag-15.c index 8ffff88d5e353..5cb8c356ed612 100644 --- a/gcc/testsuite/c-c++-common/pragma-diag-15.c +++ b/gcc/testsuite/c-c++-common/pragma-diag-15.c @@ -9,5 +9,5 @@ because the location of the macro definition is incorrectly set. This is a separate issue, will resolve it in a later patch. */ -#define X /* { dg-warning "-:-Wunused-macros" } */ +#define X /* { dg-warning "-Wunused-macros" } */ #pragma GCC diagnostic ignored "-Wunused-macros" diff --git a/gcc/testsuite/g++.dg/modules/macro-2_d.C b/gcc/testsuite/g++.dg/modules/macro-2_d.C index 04b80fb30585f..e78fc7cbb0d42 100644 --- a/gcc/testsuite/g++.dg/modules/macro-2_d.C +++ b/gcc/testsuite/g++.dg/modules/macro-2_d.C @@ -8,7 +8,7 @@ import "macro-2_b.H"; int FOO_OK = BAR_OK(1); int BAR_BAD; -// { dg-regexp {[^\n]*macro-2_d.C:10:5: error: inconsistent imported macro definition 'BAR_BAD'\nIn module [^\n]*macro-2_a.H, imported at [^\n]*macro-2_d.C:5:\n[^\n]*macro-2_a.H:11: note: '#define BAR_BAD\(BAZ\) BINKY\(2\)'\nIn module [^\n]*macro-2_b.H, imported at [^\n]*macro-2_d.C:6:\n[^\n]*macro-2_b.H:21: note: '#define BAR_BAD\(BAZ\) BINKY\(3\)'\n} } +// { dg-regexp {[^\n]*macro-2_d.C:10:5: error: inconsistent imported macro definition 'BAR_BAD'\nIn module [^\n]*macro-2_a.H, imported at [^\n]*macro-2_d.C:5:\n[^\n]*macro-2_a.H:11:9: note: '#define BAR_BAD\(BAZ\) BINKY\(2\)'\nIn module [^\n]*macro-2_b.H, imported at [^\n]*macro-2_d.C:6:\n[^\n]*macro-2_b.H:21:9: note: '#define BAR_BAD\(BAZ\) BINKY\(3\)'\n} } int FOO_BAD; -// { dg-regexp {[^\n]*macro-2_d.C:13:5: error: inconsistent imported macro definition 'FOO_BAD'\nIn module [^\n]*macro-2_a.H, imported at [^\n]*macro-2_d.C:5:\n[^\n]*macro-2_a.H:10: note: '#define FOO_BAD foo'\nIn module [^\n]*macro-2_b.H, imported at [^\n]*macro-2_d.C:6:\n[^\n]*macro-2_b.H:20: note: '#define FOO_BAD foot'\n} } +// { dg-regexp {[^\n]*macro-2_d.C:13:5: error: inconsistent imported macro definition 'FOO_BAD'\nIn module [^\n]*macro-2_a.H, imported at [^\n]*macro-2_d.C:5:\n[^\n]*macro-2_a.H:10:9: note: '#define FOO_BAD foo'\nIn module [^\n]*macro-2_b.H, imported at [^\n]*macro-2_d.C:6:\n[^\n]*macro-2_b.H:20:9: note: '#define FOO_BAD foot'\n} } diff --git a/gcc/testsuite/g++.dg/modules/macro-4_d.C b/gcc/testsuite/g++.dg/modules/macro-4_d.C index bff9494281bd7..d9c08ce16be1d 100644 --- a/gcc/testsuite/g++.dg/modules/macro-4_d.C +++ b/gcc/testsuite/g++.dg/modules/macro-4_d.C @@ -3,6 +3,6 @@ import "macro-4_b.H"; import "macro-4_a.H"; -// { dg-regexp {[^\n]*macro-4_d.C: warning: inconsistent imported macro definition 'TWO' \[-Winvalid-imported-macros\]\nIn module [^\n]*macro-4_b.H, imported at [^\n]*macro-4_d.C:[0-9]*:\n[^\n]*macro-4_b.H:[0-9]*: note: .#define TWO 2a.\nIn module [^\n]*macro-4_a.H, imported at [^\n]*macro-4_d.C:[0-9]*:\n[^\n]*macro-4_a.H:[0-9]*: note: .#define TWO 2.\n} } +// { dg-regexp {[^\n]*macro-4_d.C: warning: inconsistent imported macro definition 'TWO' \[-Winvalid-imported-macros\]\nIn module [^\n]*macro-4_b.H, imported at [^\n]*macro-4_d.C:[0-9]*:\n[^\n]*macro-4_b.H:[0-9]*:[0-9]*: note: .#define TWO 2a.\nIn module [^\n]*macro-4_a.H, imported at [^\n]*macro-4_d.C:[0-9]*:\n[^\n]*macro-4_a.H:[0-9]*:[0-9]*: note: .#define TWO 2.\n} } -// { dg-regexp {[^\n]*macro-4_d.C: warning: inconsistent imported macro definition 'THREE' \[-Winvalid-imported-macros\]\nIn module [^\n]*macro-4_b.H, imported at [^\n]*macro-4_d.C:[0-9]*:\n[^\n]*macro-4_b.H:[0-9]*: note: .#define THREE 3b.\nIn module [^\n]*macro-4_a.H, imported at [^\n]*macro-4_d.C:[0-9]*:\n[^\n]*macro-4_a.H:[0-9]*: note: .#define THREE 3.\n} } +// { dg-regexp {[^\n]*macro-4_d.C: warning: inconsistent imported macro definition 'THREE' \[-Winvalid-imported-macros\]\nIn module [^\n]*macro-4_b.H, imported at [^\n]*macro-4_d.C:[0-9]*:\n[^\n]*macro-4_b.H:[0-9]*:[0-9]*: note: .#define THREE 3b.\nIn module [^\n]*macro-4_a.H, imported at [^\n]*macro-4_d.C:[0-9]*:\n[^\n]*macro-4_a.H:[0-9]*:[0-9]*: note: .#define THREE 3.\n} } diff --git a/gcc/testsuite/g++.dg/modules/macro-4_e.C b/gcc/testsuite/g++.dg/modules/macro-4_e.C index 38fa6c7feebe0..392387f3a1c9e 100644 --- a/gcc/testsuite/g++.dg/modules/macro-4_e.C +++ b/gcc/testsuite/g++.dg/modules/macro-4_e.C @@ -10,4 +10,4 @@ int stop; #error bah! #endif -// { dg-regexp {[^\n]*macro-4_e.C: warning: inconsistent imported macro definition 'TWO' \[-Winvalid-imported-macros\]\nIn module [^\n]*macro-4_b.H, imported at [^\n]*macro-4_e.C:[0-9]*:\n[^\n]*macro-4_b.H:[0-9]*: note: .#define TWO 2a.\nIn module [^\n]*macro-4_a.H, imported at [^\n]*macro-4_e.C:[0-9]*:\n[^\n]*macro-4_a.H:[0-9]*: note: .#define TWO 2.\n} } +// { dg-regexp {[^\n]*macro-4_e.C: warning: inconsistent imported macro definition 'TWO' \[-Winvalid-imported-macros\]\nIn module [^\n]*macro-4_b.H, imported at [^\n]*macro-4_e.C:[0-9]*:\n[^\n]*macro-4_b.H:[0-9]*:[0-9]*: note: .#define TWO 2a.\nIn module [^\n]*macro-4_a.H, imported at [^\n]*macro-4_e.C:[0-9]*:\n[^\n]*macro-4_a.H:[0-9]*:[0-9]*: note: .#define TWO 2.\n} } diff --git a/gcc/testsuite/g++.dg/spellcheck-macro-ordering.C b/gcc/testsuite/g++.dg/spellcheck-macro-ordering.C index bbd41f48e09ff..59e9f8a943845 100644 --- a/gcc/testsuite/g++.dg/spellcheck-macro-ordering.C +++ b/gcc/testsuite/g++.dg/spellcheck-macro-ordering.C @@ -13,4 +13,4 @@ class DocTargetDriver { }; #define OVERRIDE override -// { dg-message "-:it was later defined here" "" { target *-*-* } .-1 } +// { dg-message "9:it was later defined here" "" { target *-*-* } .-1 } diff --git a/gcc/testsuite/gcc.dg/builtin-redefine.c b/gcc/testsuite/gcc.dg/builtin-redefine.c index 882b2210992f4..8090015f69344 100644 --- a/gcc/testsuite/gcc.dg/builtin-redefine.c +++ b/gcc/testsuite/gcc.dg/builtin-redefine.c @@ -27,8 +27,8 @@ #define __TIME__ "X" /* Define while undefined. */ #define __TIME__ "X" /* Re-define while defined. */ /* { dg-line time_prev } */ -#define __TIME__ "Y" /* { dg-warning "-:\"__TIME__\" redefined" } */ -/* { dg-message "-:previous definition" "" { target *-*-* } time_prev } */ +#define __TIME__ "Y" /* { dg-warning "\"__TIME__\" redefined" } */ +/* { dg-message "previous definition" "" { target *-*-* } time_prev } */ #undef __TIME__ /* Undefine while defined. */ @@ -38,8 +38,8 @@ #define __DATE__ "X" /* Define while undefined. */ #define __DATE__ "X" /* Re-define while defined. */ /* { dg-line date_prev } */ -#define __DATE__ "Y" /* { dg-warning "-:\"__DATE__\" redefined" } */ -/* { dg-message "-:previous definition" "" { target *-*-* } date_prev } */ +#define __DATE__ "Y" /* { dg-warning "\"__DATE__\" redefined" } */ +/* { dg-message "previous definition" "" { target *-*-* } date_prev } */ #undef __DATE__ /* Undefine while defined. */ @@ -47,8 +47,8 @@ #define __TIMESTAMP__ "X" /* Define while already defined. */ #define __TIMESTAMP__ "X" /* Re-define while defined. */ /* { dg-line timestamp_prev } */ -#define __TIMESTAMP__ "Y" /* { dg-warning "-:\"__TIMESTAMP__\" redefined" } */ -/* { dg-message "-:previous definition" "" { target *-*-* } timestamp_prev } */ +#define __TIMESTAMP__ "Y" /* { dg-warning "\"__TIMESTAMP__\" redefined" } */ +/* { dg-message "previous definition" "" { target *-*-* } timestamp_prev } */ #undef __TIMESTAMP__ /* Undefine while defined. */ @@ -71,9 +71,9 @@ /* { dg-bogus "Expected built-in is not defined" "" { target *-*-* } .-1 } */ #endif -#define __LINE__ 0 /* { dg-warning "-:\"__LINE__\" redef" } */ -#define __INCLUDE_LEVEL__ 0 /* { dg-warning "-:\"__INCLUDE_LEVEL__\" redef" } */ -#define __COUNTER__ 0 /* { dg-warning "-:\"__COUNTER__\" redef" } */ +#define __LINE__ 0 /* { dg-warning "\"__LINE__\" redef" } */ +#define __INCLUDE_LEVEL__ 0 /* { dg-warning "\"__INCLUDE_LEVEL__\" redef" } */ +#define __COUNTER__ 0 /* { dg-warning "\"__COUNTER__\" redef" } */ int unused; /* Silence `ISO C forbids an empty translation unit' warning. */ diff --git a/gcc/testsuite/gcc.dg/cpp/Wunused.c b/gcc/testsuite/gcc.dg/cpp/Wunused.c index d6f76288cd741..ac363ad04b8ec 100644 --- a/gcc/testsuite/gcc.dg/cpp/Wunused.c +++ b/gcc/testsuite/gcc.dg/cpp/Wunused.c @@ -15,9 +15,9 @@ #define used3 /* { dg-bogus "used" } */ #define used4 used4 /* { dg-bogus "used" } */ -#define unused5 /* { dg-warning "-:used" } */ -#define unused6 /* { dg-warning "-:used" } */ -#define unused7() /* { dg-warning "-:used" } */ +#define unused5 /* { dg-warning "used" } */ +#define unused6 /* { dg-warning "used" } */ +#define unused7() /* { dg-warning "used" } */ #if defined used1 #endif diff --git a/gcc/testsuite/gcc.dg/cpp/redef2.c b/gcc/testsuite/gcc.dg/cpp/redef2.c index 439d33a705799..1dbc10033edfc 100644 --- a/gcc/testsuite/gcc.dg/cpp/redef2.c +++ b/gcc/testsuite/gcc.dg/cpp/redef2.c @@ -17,15 +17,15 @@ #define foo(x) x #define foo(x)x /* { dg-bogus "redefined" "redefined foo" } */ -/* { dg-warning "-:redefined" "redef mac" { target *-*-* } 7 } - { dg-warning "-:redefined" "redef mac" { target *-*-* } 8 } - { dg-warning "-:redefined" "redef mac" { target *-*-* } 9 } - { dg-warning "-:redefined" "redef ro" { target *-*-* } 12 } - { dg-warning "-:redefined" "redef va" { target *-*-* } 15 } +/* { dg-warning "redefined" "redef mac" { target *-*-* } 7 } + { dg-warning "redefined" "redef mac" { target *-*-* } 8 } + { dg-warning "redefined" "redef mac" { target *-*-* } 9 } + { dg-warning "redefined" "redef ro" { target *-*-* } 12 } + { dg-warning "redefined" "redef va" { target *-*-* } 15 } - { dg-message "-:previous" "prev def mac" { target *-*-* } 6 } - { dg-message "-:previous" "prev def mac" { target *-*-* } 7 } - { dg-message "-:previous" "prev def mac" { target *-*-* } 8 } - { dg-message "-:previous" "prev def ro" { target *-*-* } 11 } - { dg-message "-:previous" "prev def va" { target *-*-* } 14 } + { dg-message "previous" "prev def mac" { target *-*-* } 6 } + { dg-message "previous" "prev def mac" { target *-*-* } 7 } + { dg-message "previous" "prev def mac" { target *-*-* } 8 } + { dg-message "previous" "prev def ro" { target *-*-* } 11 } + { dg-message "previous" "prev def va" { target *-*-* } 14 } */ diff --git a/gcc/testsuite/gcc.dg/cpp/redef3.c b/gcc/testsuite/gcc.dg/cpp/redef3.c index 4e4ef128b1024..1c541a45bb186 100644 --- a/gcc/testsuite/gcc.dg/cpp/redef3.c +++ b/gcc/testsuite/gcc.dg/cpp/redef3.c @@ -11,11 +11,11 @@ #define D 1 2 #define E -/* { dg-warning "-:redefined" "redef A" { target *-*-* } 7 } - { dg-warning "-:redefined" "redef B" { target *-*-* } 9 } - { dg-warning "-:redefined" "redef D" { target *-*-* } 11 } - { dg-warning "-:redefined" "redef E" { target *-*-* } 12 } - { dg-message "-:previous" "prev def A" { target *-*-* } 6 } - { dg-message "-:previous" "prev def B" { target *-*-* } 8 } - { dg-message "-:previous" "prev def D/E" { target *-*-* } 0 } +/* { dg-warning "redefined" "redef A" { target *-*-* } 7 } + { dg-warning "redefined" "redef B" { target *-*-* } 9 } + { dg-warning "redefined" "redef D" { target *-*-* } 11 } + { dg-warning "redefined" "redef E" { target *-*-* } 12 } + { dg-message "previous" "prev def A" { target *-*-* } 6 } + { dg-message "previous" "prev def B" { target *-*-* } 8 } + { dg-message "previous" "prev def D/E" { target *-*-* } 0 } */ diff --git a/gcc/testsuite/gcc.dg/cpp/redef4.c b/gcc/testsuite/gcc.dg/cpp/redef4.c index aa6729b770b65..b34635b2e423b 100644 --- a/gcc/testsuite/gcc.dg/cpp/redef4.c +++ b/gcc/testsuite/gcc.dg/cpp/redef4.c @@ -4,41 +4,41 @@ /* { dg-do preprocess } */ /* { dg-options "" } */ -#define str(x) #x /* { dg-message "-:previous definition" } */ -#define str(x) %: x /* { dg-warning "-:redefined" } */ +#define str(x) #x /* { dg-message "previous definition" } */ +#define str(x) %: x /* { dg-warning "redefined" } */ #undef str -#define str(x) #x /* { dg-message "-:previous definition" } */ -#define str(x) # x /* { dg-warning "-:redefined" } */ +#define str(x) #x /* { dg-message "previous definition" } */ +#define str(x) # x /* { dg-warning "redefined" } */ #undef str -#define str(x) #x /* { dg-message "-:previous definition" } */ -#define str(x) %: x /* { dg-warning "-:redefined" } */ +#define str(x) #x /* { dg-message "previous definition" } */ +#define str(x) %: x /* { dg-warning "redefined" } */ #undef str -#define str(x) %:x /* { dg-message "-:previous definition" } */ -#define str(x) #x /* { dg-warning "-:redefined" } */ +#define str(x) %:x /* { dg-message "previous definition" } */ +#define str(x) #x /* { dg-warning "redefined" } */ #undef str -#define str(x) %:x /* { dg-message "-:previous definition" } */ -#define str(x) %: x /* { dg-warning "-:redefined" } */ +#define str(x) %:x /* { dg-message "previous definition" } */ +#define str(x) %: x /* { dg-warning "redefined" } */ #undef str -#define str(x) %:x /* { dg-message "-:previous definition" } */ -#define str(x) # x /* { dg-warning "-:redefined" } */ +#define str(x) %:x /* { dg-message "previous definition" } */ +#define str(x) # x /* { dg-warning "redefined" } */ #undef str -#define str(x) %:x /* { dg-message "-:previous definition" } */ -#define str(x) %: x /* { dg-warning "-:redefined" } */ +#define str(x) %:x /* { dg-message "previous definition" } */ +#define str(x) %: x /* { dg-warning "redefined" } */ #undef str -#define str(x) # x /* { dg-message "-:previous definition" } */ -#define str(x) #x /* { dg-warning "-:redefined" } */ +#define str(x) # x /* { dg-message "previous definition" } */ +#define str(x) #x /* { dg-warning "redefined" } */ #undef str -#define str(x) # x /* { dg-message "-:previous definition" } */ -#define str(x) %: x /* { dg-warning "-:redefined" } */ +#define str(x) # x /* { dg-message "previous definition" } */ +#define str(x) %: x /* { dg-warning "redefined" } */ #undef str -#define str(x) # x /* { dg-message "-:previous definition" } */ -#define str(x) %: x /* { dg-warning "-:redefined" } */ +#define str(x) # x /* { dg-message "previous definition" } */ +#define str(x) %: x /* { dg-warning "redefined" } */ #undef str -#define str(x) %: x /* { dg-message "-:previous definition" } */ -#define str(x) #x /* { dg-warning "-:redefined" } */ +#define str(x) %: x /* { dg-message "previous definition" } */ +#define str(x) #x /* { dg-warning "redefined" } */ #undef str -#define str(x) %: x /* { dg-message "-:previous definition" } */ -#define str(x) # x /* { dg-warning "-:redefined" } */ +#define str(x) %: x /* { dg-message "previous definition" } */ +#define str(x) # x /* { dg-warning "redefined" } */ #undef str #define str(x) #x @@ -54,173 +54,173 @@ #define str(x) %: x #undef str -#define astr(x) a#x /* { dg-message "-:previous definition" } */ -#define astr(x) a%: x /* { dg-warning "-:redefined" } */ +#define astr(x) a#x /* { dg-message "previous definition" } */ +#define astr(x) a%: x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a#x /* { dg-message "-:previous definition" } */ -#define astr(x) a# x /* { dg-warning "-:redefined" } */ +#define astr(x) a#x /* { dg-message "previous definition" } */ +#define astr(x) a# x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a#x /* { dg-message "-:previous definition" } */ -#define astr(x) a%: x /* { dg-warning "-:redefined" } */ +#define astr(x) a#x /* { dg-message "previous definition" } */ +#define astr(x) a%: x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a#x /* { dg-message "-:previous definition" } */ -#define astr(x) a #x /* { dg-warning "-:redefined" } */ +#define astr(x) a#x /* { dg-message "previous definition" } */ +#define astr(x) a #x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a#x /* { dg-message "-:previous definition" } */ -#define astr(x) a %:x /* { dg-warning "-:redefined" } */ +#define astr(x) a#x /* { dg-message "previous definition" } */ +#define astr(x) a %:x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a#x /* { dg-message "-:previous definition" } */ -#define astr(x) a # x /* { dg-warning "-:redefined" } */ +#define astr(x) a#x /* { dg-message "previous definition" } */ +#define astr(x) a # x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a#x /* { dg-message "-:previous definition" } */ -#define astr(x) a %: x /* { dg-warning "-:redefined" } */ +#define astr(x) a#x /* { dg-message "previous definition" } */ +#define astr(x) a %: x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a%:x /* { dg-message "-:previous definition" } */ -#define astr(x) a#x /* { dg-warning "-:redefined" } */ +#define astr(x) a%:x /* { dg-message "previous definition" } */ +#define astr(x) a#x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a%:x /* { dg-message "-:previous definition" } */ -#define astr(x) a%: x /* { dg-warning "-:redefined" } */ +#define astr(x) a%:x /* { dg-message "previous definition" } */ +#define astr(x) a%: x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a%:x /* { dg-message "-:previous definition" } */ -#define astr(x) a# x /* { dg-warning "-:redefined" } */ +#define astr(x) a%:x /* { dg-message "previous definition" } */ +#define astr(x) a# x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a%:x /* { dg-message "-:previous definition" } */ -#define astr(x) a%: x /* { dg-warning "-:redefined" } */ +#define astr(x) a%:x /* { dg-message "previous definition" } */ +#define astr(x) a%: x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a%:x /* { dg-message "-:previous definition" } */ -#define astr(x) a #x /* { dg-warning "-:redefined" } */ +#define astr(x) a%:x /* { dg-message "previous definition" } */ +#define astr(x) a #x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a%:x /* { dg-message "-:previous definition" } */ -#define astr(x) a %:x /* { dg-warning "-:redefined" } */ +#define astr(x) a%:x /* { dg-message "previous definition" } */ +#define astr(x) a %:x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a%:x /* { dg-message "-:previous definition" } */ -#define astr(x) a # x /* { dg-warning "-:redefined" } */ +#define astr(x) a%:x /* { dg-message "previous definition" } */ +#define astr(x) a # x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a%:x /* { dg-message "-:previous definition" } */ -#define astr(x) a %: x /* { dg-warning "-:redefined" } */ +#define astr(x) a%:x /* { dg-message "previous definition" } */ +#define astr(x) a %: x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a# x /* { dg-message "-:previous definition" } */ -#define astr(x) a#x /* { dg-warning "-:redefined" } */ +#define astr(x) a# x /* { dg-message "previous definition" } */ +#define astr(x) a#x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a# x /* { dg-message "-:previous definition" } */ -#define astr(x) a%: x /* { dg-warning "-:redefined" } */ +#define astr(x) a# x /* { dg-message "previous definition" } */ +#define astr(x) a%: x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a# x /* { dg-message "-:previous definition" } */ -#define astr(x) a%: x /* { dg-warning "-:redefined" } */ +#define astr(x) a# x /* { dg-message "previous definition" } */ +#define astr(x) a%: x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a# x /* { dg-message "-:previous definition" } */ -#define astr(x) a #x /* { dg-warning "-:redefined" } */ +#define astr(x) a# x /* { dg-message "previous definition" } */ +#define astr(x) a #x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a# x /* { dg-message "-:previous definition" } */ -#define astr(x) a %:x /* { dg-warning "-:redefined" } */ +#define astr(x) a# x /* { dg-message "previous definition" } */ +#define astr(x) a %:x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a# x /* { dg-message "-:previous definition" } */ -#define astr(x) a # x /* { dg-warning "-:redefined" } */ +#define astr(x) a# x /* { dg-message "previous definition" } */ +#define astr(x) a # x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a# x /* { dg-message "-:previous definition" } */ -#define astr(x) a %: x /* { dg-warning "-:redefined" } */ +#define astr(x) a# x /* { dg-message "previous definition" } */ +#define astr(x) a %: x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a%: x /* { dg-message "-:previous definition" } */ -#define astr(x) a#x /* { dg-warning "-:redefined" } */ +#define astr(x) a%: x /* { dg-message "previous definition" } */ +#define astr(x) a#x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a%: x /* { dg-message "-:previous definition" } */ -#define astr(x) a# x /* { dg-warning "-:redefined" } */ +#define astr(x) a%: x /* { dg-message "previous definition" } */ +#define astr(x) a# x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a%: x /* { dg-message "-:previous definition" } */ -#define astr(x) a #x /* { dg-warning "-:redefined" } */ +#define astr(x) a%: x /* { dg-message "previous definition" } */ +#define astr(x) a #x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a%: x /* { dg-message "-:previous definition" } */ -#define astr(x) a %:x /* { dg-warning "-:redefined" } */ +#define astr(x) a%: x /* { dg-message "previous definition" } */ +#define astr(x) a %:x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a%: x /* { dg-message "-:previous definition" } */ -#define astr(x) a # x /* { dg-warning "-:redefined" } */ +#define astr(x) a%: x /* { dg-message "previous definition" } */ +#define astr(x) a # x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a%: x /* { dg-message "-:previous definition" } */ -#define astr(x) a %: x /* { dg-warning "-:redefined" } */ +#define astr(x) a%: x /* { dg-message "previous definition" } */ +#define astr(x) a %: x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a #x /* { dg-message "-:previous definition" } */ -#define astr(x) a#x /* { dg-warning "-:redefined" } */ +#define astr(x) a #x /* { dg-message "previous definition" } */ +#define astr(x) a#x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a #x /* { dg-message "-:previous definition" } */ -#define astr(x) a%: x /* { dg-warning "-:redefined" } */ +#define astr(x) a #x /* { dg-message "previous definition" } */ +#define astr(x) a%: x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a #x /* { dg-message "-:previous definition" } */ -#define astr(x) a# x /* { dg-warning "-:redefined" } */ +#define astr(x) a #x /* { dg-message "previous definition" } */ +#define astr(x) a# x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a #x /* { dg-message "-:previous definition" } */ -#define astr(x) a%: x /* { dg-warning "-:redefined" } */ +#define astr(x) a #x /* { dg-message "previous definition" } */ +#define astr(x) a%: x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a #x /* { dg-message "-:previous definition" } */ -#define astr(x) a %:x /* { dg-warning "-:redefined" } */ +#define astr(x) a #x /* { dg-message "previous definition" } */ +#define astr(x) a %:x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a #x /* { dg-message "-:previous definition" } */ -#define astr(x) a # x /* { dg-warning "-:redefined" } */ +#define astr(x) a #x /* { dg-message "previous definition" } */ +#define astr(x) a # x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a #x /* { dg-message "-:previous definition" } */ -#define astr(x) a %: x /* { dg-warning "-:redefined" } */ +#define astr(x) a #x /* { dg-message "previous definition" } */ +#define astr(x) a %: x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a %:x /* { dg-message "-:previous definition" } */ -#define astr(x) a#x /* { dg-warning "-:redefined" } */ +#define astr(x) a %:x /* { dg-message "previous definition" } */ +#define astr(x) a#x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a %:x /* { dg-message "-:previous definition" } */ -#define astr(x) a%: x /* { dg-warning "-:redefined" } */ +#define astr(x) a %:x /* { dg-message "previous definition" } */ +#define astr(x) a%: x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a %:x /* { dg-message "-:previous definition" } */ -#define astr(x) a# x /* { dg-warning "-:redefined" } */ +#define astr(x) a %:x /* { dg-message "previous definition" } */ +#define astr(x) a# x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a %:x /* { dg-message "-:previous definition" } */ -#define astr(x) a%: x /* { dg-warning "-:redefined" } */ +#define astr(x) a %:x /* { dg-message "previous definition" } */ +#define astr(x) a%: x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a %:x /* { dg-message "-:previous definition" } */ -#define astr(x) a #x /* { dg-warning "-:redefined" } */ +#define astr(x) a %:x /* { dg-message "previous definition" } */ +#define astr(x) a #x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a %:x /* { dg-message "-:previous definition" } */ -#define astr(x) a # x /* { dg-warning "-:redefined" } */ +#define astr(x) a %:x /* { dg-message "previous definition" } */ +#define astr(x) a # x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a %:x /* { dg-message "-:previous definition" } */ -#define astr(x) a %: x /* { dg-warning "-:redefined" } */ +#define astr(x) a %:x /* { dg-message "previous definition" } */ +#define astr(x) a %: x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a # x /* { dg-message "-:previous definition" } */ -#define astr(x) a#x /* { dg-warning "-:redefined" } */ +#define astr(x) a # x /* { dg-message "previous definition" } */ +#define astr(x) a#x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a # x /* { dg-message "-:previous definition" } */ -#define astr(x) a%: x /* { dg-warning "-:redefined" } */ +#define astr(x) a # x /* { dg-message "previous definition" } */ +#define astr(x) a%: x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a # x /* { dg-message "-:previous definition" } */ -#define astr(x) a# x /* { dg-warning "-:redefined" } */ +#define astr(x) a # x /* { dg-message "previous definition" } */ +#define astr(x) a# x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a # x /* { dg-message "-:previous definition" } */ -#define astr(x) a%: x /* { dg-warning "-:redefined" } */ +#define astr(x) a # x /* { dg-message "previous definition" } */ +#define astr(x) a%: x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a # x /* { dg-message "-:previous definition" } */ -#define astr(x) a #x /* { dg-warning "-:redefined" } */ +#define astr(x) a # x /* { dg-message "previous definition" } */ +#define astr(x) a #x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a # x /* { dg-message "-:previous definition" } */ -#define astr(x) a %:x /* { dg-warning "-:redefined" } */ +#define astr(x) a # x /* { dg-message "previous definition" } */ +#define astr(x) a %:x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a # x /* { dg-message "-:previous definition" } */ -#define astr(x) a %: x /* { dg-warning "-:redefined" } */ +#define astr(x) a # x /* { dg-message "previous definition" } */ +#define astr(x) a %: x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a %: x /* { dg-message "-:previous definition" } */ -#define astr(x) a#x /* { dg-warning "-:redefined" } */ +#define astr(x) a %: x /* { dg-message "previous definition" } */ +#define astr(x) a#x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a %: x /* { dg-message "-:previous definition" } */ -#define astr(x) a%: x /* { dg-warning "-:redefined" } */ +#define astr(x) a %: x /* { dg-message "previous definition" } */ +#define astr(x) a%: x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a %: x /* { dg-message "-:previous definition" } */ -#define astr(x) a# x /* { dg-warning "-:redefined" } */ +#define astr(x) a %: x /* { dg-message "previous definition" } */ +#define astr(x) a# x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a %: x /* { dg-message "-:previous definition" } */ -#define astr(x) a%: x /* { dg-warning "-:redefined" } */ +#define astr(x) a %: x /* { dg-message "previous definition" } */ +#define astr(x) a%: x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a %: x /* { dg-message "-:previous definition" } */ -#define astr(x) a #x /* { dg-warning "-:redefined" } */ +#define astr(x) a %: x /* { dg-message "previous definition" } */ +#define astr(x) a #x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a %: x /* { dg-message "-:previous definition" } */ -#define astr(x) a %:x /* { dg-warning "-:redefined" } */ +#define astr(x) a %: x /* { dg-message "previous definition" } */ +#define astr(x) a %:x /* { dg-warning "redefined" } */ #undef astr -#define astr(x) a %: x /* { dg-message "-:previous definition" } */ -#define astr(x) a # x /* { dg-warning "-:redefined" } */ +#define astr(x) a %: x /* { dg-message "previous definition" } */ +#define astr(x) a # x /* { dg-warning "redefined" } */ #undef astr #define astr(x) a#x @@ -248,173 +248,173 @@ #define astr(x) a %: x #undef astr -#define cat(x,y) x##y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x%:%: y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x##y /* { dg-message "previous definition" } */ +#define cat(x,y) x%:%: y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x##y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x## y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x##y /* { dg-message "previous definition" } */ +#define cat(x,y) x## y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x##y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x%:%: y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x##y /* { dg-message "previous definition" } */ +#define cat(x,y) x%:%: y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x##y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x ##y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x##y /* { dg-message "previous definition" } */ +#define cat(x,y) x ##y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x##y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x %:%:y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x##y /* { dg-message "previous definition" } */ +#define cat(x,y) x %:%:y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x##y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x ## y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x##y /* { dg-message "previous definition" } */ +#define cat(x,y) x ## y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x##y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x %:%: y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x##y /* { dg-message "previous definition" } */ +#define cat(x,y) x %:%: y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x%:%:y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x##y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x%:%:y /* { dg-message "previous definition" } */ +#define cat(x,y) x##y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x%:%:y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x%:%: y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x%:%:y /* { dg-message "previous definition" } */ +#define cat(x,y) x%:%: y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x%:%:y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x## y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x%:%:y /* { dg-message "previous definition" } */ +#define cat(x,y) x## y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x%:%:y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x%:%: y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x%:%:y /* { dg-message "previous definition" } */ +#define cat(x,y) x%:%: y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x%:%:y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x ##y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x%:%:y /* { dg-message "previous definition" } */ +#define cat(x,y) x ##y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x%:%:y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x %:%:y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x%:%:y /* { dg-message "previous definition" } */ +#define cat(x,y) x %:%:y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x%:%:y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x ## y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x%:%:y /* { dg-message "previous definition" } */ +#define cat(x,y) x ## y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x%:%:y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x %:%: y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x%:%:y /* { dg-message "previous definition" } */ +#define cat(x,y) x %:%: y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x## y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x##y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x## y /* { dg-message "previous definition" } */ +#define cat(x,y) x##y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x## y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x%:%: y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x## y /* { dg-message "previous definition" } */ +#define cat(x,y) x%:%: y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x## y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x%:%: y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x## y /* { dg-message "previous definition" } */ +#define cat(x,y) x%:%: y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x## y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x ##y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x## y /* { dg-message "previous definition" } */ +#define cat(x,y) x ##y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x## y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x %:%:y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x## y /* { dg-message "previous definition" } */ +#define cat(x,y) x %:%:y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x## y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x ## y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x## y /* { dg-message "previous definition" } */ +#define cat(x,y) x ## y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x## y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x %:%: y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x## y /* { dg-message "previous definition" } */ +#define cat(x,y) x %:%: y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x%:%: y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x##y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x%:%: y /* { dg-message "previous definition" } */ +#define cat(x,y) x##y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x%:%: y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x## y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x%:%: y /* { dg-message "previous definition" } */ +#define cat(x,y) x## y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x%:%: y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x ##y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x%:%: y /* { dg-message "previous definition" } */ +#define cat(x,y) x ##y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x%:%: y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x %:%:y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x%:%: y /* { dg-message "previous definition" } */ +#define cat(x,y) x %:%:y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x%:%: y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x ## y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x%:%: y /* { dg-message "previous definition" } */ +#define cat(x,y) x ## y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x%:%: y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x %:%: y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x%:%: y /* { dg-message "previous definition" } */ +#define cat(x,y) x %:%: y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x ##y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x##y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x ##y /* { dg-message "previous definition" } */ +#define cat(x,y) x##y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x ##y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x%:%: y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x ##y /* { dg-message "previous definition" } */ +#define cat(x,y) x%:%: y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x ##y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x## y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x ##y /* { dg-message "previous definition" } */ +#define cat(x,y) x## y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x ##y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x%:%: y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x ##y /* { dg-message "previous definition" } */ +#define cat(x,y) x%:%: y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x ##y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x %:%:y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x ##y /* { dg-message "previous definition" } */ +#define cat(x,y) x %:%:y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x ##y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x ## y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x ##y /* { dg-message "previous definition" } */ +#define cat(x,y) x ## y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x ##y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x %:%: y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x ##y /* { dg-message "previous definition" } */ +#define cat(x,y) x %:%: y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x %:%:y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x##y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x %:%:y /* { dg-message "previous definition" } */ +#define cat(x,y) x##y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x %:%:y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x%:%: y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x %:%:y /* { dg-message "previous definition" } */ +#define cat(x,y) x%:%: y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x %:%:y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x## y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x %:%:y /* { dg-message "previous definition" } */ +#define cat(x,y) x## y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x %:%:y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x%:%: y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x %:%:y /* { dg-message "previous definition" } */ +#define cat(x,y) x%:%: y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x %:%:y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x ##y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x %:%:y /* { dg-message "previous definition" } */ +#define cat(x,y) x ##y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x %:%:y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x ## y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x %:%:y /* { dg-message "previous definition" } */ +#define cat(x,y) x ## y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x %:%:y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x %:%: y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x %:%:y /* { dg-message "previous definition" } */ +#define cat(x,y) x %:%: y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x ## y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x##y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x ## y /* { dg-message "previous definition" } */ +#define cat(x,y) x##y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x ## y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x%:%: y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x ## y /* { dg-message "previous definition" } */ +#define cat(x,y) x%:%: y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x ## y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x## y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x ## y /* { dg-message "previous definition" } */ +#define cat(x,y) x## y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x ## y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x%:%: y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x ## y /* { dg-message "previous definition" } */ +#define cat(x,y) x%:%: y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x ## y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x ##y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x ## y /* { dg-message "previous definition" } */ +#define cat(x,y) x ##y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x ## y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x %:%:y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x ## y /* { dg-message "previous definition" } */ +#define cat(x,y) x %:%:y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x ## y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x %:%: y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x ## y /* { dg-message "previous definition" } */ +#define cat(x,y) x %:%: y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x %:%: y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x##y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x %:%: y /* { dg-message "previous definition" } */ +#define cat(x,y) x##y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x %:%: y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x%:%: y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x %:%: y /* { dg-message "previous definition" } */ +#define cat(x,y) x%:%: y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x %:%: y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x## y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x %:%: y /* { dg-message "previous definition" } */ +#define cat(x,y) x## y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x %:%: y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x%:%: y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x %:%: y /* { dg-message "previous definition" } */ +#define cat(x,y) x%:%: y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x %:%: y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x ##y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x %:%: y /* { dg-message "previous definition" } */ +#define cat(x,y) x ##y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x %:%: y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x %:%:y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x %:%: y /* { dg-message "previous definition" } */ +#define cat(x,y) x %:%:y /* { dg-warning "redefined" } */ #undef cat -#define cat(x,y) x %:%: y /* { dg-message "-:previous definition" } */ -#define cat(x,y) x ## y /* { dg-warning "-:redefined" } */ +#define cat(x,y) x %:%: y /* { dg-message "previous definition" } */ +#define cat(x,y) x ## y /* { dg-warning "redefined" } */ #undef cat #define cat(x,y) x##y @@ -442,28 +442,28 @@ #define cat(x,y) x %:%: y #undef cat -#define cat3(x,y,z) x##y##z /* { dg-message "-:previous definition" } */ -#define cat3(x,y,z) x##y####z /* { dg-warning "-:redefined" } */ +#define cat3(x,y,z) x##y##z /* { dg-message "previous definition" } */ +#define cat3(x,y,z) x##y####z /* { dg-warning "redefined" } */ #undef cat3 -#define cat3(x,y,z) x##y####z /* { dg-message "-:previous definition" } */ -#define cat3(x,y,z) x####y##z /* { dg-warning "-:redefined" } */ +#define cat3(x,y,z) x##y####z /* { dg-message "previous definition" } */ +#define cat3(x,y,z) x####y##z /* { dg-warning "redefined" } */ #undef cat3 -#define cat3(x,y,z) x##y####z /* { dg-message "-:previous definition" } */ -#define cat3(x,y,z) x##y## ##z /* { dg-warning "-:redefined" } */ +#define cat3(x,y,z) x##y####z /* { dg-message "previous definition" } */ +#define cat3(x,y,z) x##y## ##z /* { dg-warning "redefined" } */ #undef cat3 -#define cat3(x,y,z) x##y####z /* { dg-message "-:previous definition" } */ -#define cat3(x,y,z) x##y##%:%:z /* { dg-warning "-:redefined" } */ +#define cat3(x,y,z) x##y####z /* { dg-message "previous definition" } */ +#define cat3(x,y,z) x##y##%:%:z /* { dg-warning "redefined" } */ #undef cat3 -#define cat3(x,y,z) x##y######## ####z /* { dg-message "-:previous definition" } */ -#define cat3(x,y,z) x##y############z /* { dg-warning "-:redefined" } */ +#define cat3(x,y,z) x##y######## ####z /* { dg-message "previous definition" } */ +#define cat3(x,y,z) x##y############z /* { dg-warning "redefined" } */ #undef cat3 -#define cat3(x,y,z) x##y############z /* { dg-message "-:previous definition" } */ -#define cat3(x,y,z) x##y########%:%:##z /* { dg-warning "-:redefined" } */ +#define cat3(x,y,z) x##y############z /* { dg-message "previous definition" } */ +#define cat3(x,y,z) x##y########%:%:##z /* { dg-warning "redefined" } */ #undef cat3 #define cat3(x,y,z) x##y##z diff --git a/gcc/testsuite/gcc.dg/cpp/ucnid-11-utf8.c b/gcc/testsuite/gcc.dg/cpp/ucnid-11-utf8.c index 56b88f8be6136..701765d1ecaa6 100644 --- a/gcc/testsuite/gcc.dg/cpp/ucnid-11-utf8.c +++ b/gcc/testsuite/gcc.dg/cpp/ucnid-11-utf8.c @@ -4,23 +4,23 @@ /* { dg-options "-std=c99 -pedantic-errors" } */ /* Different spelling of UCN in expansion. */ -#define m1 \u00c1 /* { dg-message "-:previous definition" } */ -#define m1 Á /* { dg-error "-:redefined" } */ +#define m1 \u00c1 /* { dg-message "previous definition" } */ +#define m1 Á /* { dg-error "redefined" } */ #define m1ok Á #define m1ok Á /* Different spelling of UCN in argument name. */ -#define m2(\u00c1) /* { dg-message "-:previous definition" } */ -#define m2(Á) /* { dg-error "-:redefined" } */ +#define m2(\u00c1) /* { dg-message "previous definition" } */ +#define m2(Á) /* { dg-error "redefined" } */ #define m2ok(Á) #define m2ok(Á) /* Same spelling in argument name but different spelling when used in expansion. */ -#define m3(\u00c1) \u00c1 /* { dg-message "-:previous definition" } */ -#define m3(\u00c1) Á /* { dg-error "-:redefined" } */ +#define m3(\u00c1) \u00c1 /* { dg-message "previous definition" } */ +#define m3(\u00c1) Á /* { dg-error "redefined" } */ #define m3ok(\u00c1) Á #define m3ok(\u00c1) Á diff --git a/gcc/testsuite/gcc.dg/cpp/ucnid-11.c b/gcc/testsuite/gcc.dg/cpp/ucnid-11.c index b6956f5445436..a44a3eaf42123 100644 --- a/gcc/testsuite/gcc.dg/cpp/ucnid-11.c +++ b/gcc/testsuite/gcc.dg/cpp/ucnid-11.c @@ -4,23 +4,23 @@ /* { dg-options "-std=c99 -pedantic-errors" } */ /* Different spelling of UCN in expansion. */ -#define m1 \u00c1 /* { dg-message "-:previous definition" } */ -#define m1 \u00C1 /* { dg-error "-:redefined" } */ +#define m1 \u00c1 /* { dg-message "previous definition" } */ +#define m1 \u00C1 /* { dg-error "redefined" } */ #define m1ok \u00c1 #define m1ok \u00c1 /* Different spelling of UCN in argument name. */ -#define m2(\u00c1) /* { dg-message "-:previous definition" } */ -#define m2(\u00C1) /* { dg-error "-:redefined" } */ +#define m2(\u00c1) /* { dg-message "previous definition" } */ +#define m2(\u00C1) /* { dg-error "redefined" } */ #define m2ok(\u00c1) #define m2ok(\u00c1) /* Same spelling in argument name but different spelling when used in expansion. */ -#define m3(\u00c1) \u00c1 /* { dg-message "-:previous definition" } */ -#define m3(\u00c1) \u00C1 /* { dg-error "-:redefined" } */ +#define m3(\u00c1) \u00c1 /* { dg-message "previous definition" } */ +#define m3(\u00c1) \u00C1 /* { dg-error "redefined" } */ #define m3ok(\u00c1) \u00C1 #define m3ok(\u00c1) \u00C1 diff --git a/gcc/testsuite/gcc.dg/cpp/undef2.c b/gcc/testsuite/gcc.dg/cpp/undef2.c index 189a72dd9c2d9..f9b047b8a258c 100644 --- a/gcc/testsuite/gcc.dg/cpp/undef2.c +++ b/gcc/testsuite/gcc.dg/cpp/undef2.c @@ -3,9 +3,9 @@ /* { dg-do preprocess } */ -#undef __DATE__ /* { dg-warning "-:undefining \"__DATE__\"" } */ -#undef __TIME__ /* { dg-warning "-:undefining \"__TIME__\"" } */ -#undef __FILE__ /* { dg-warning "-:undefining \"__FILE__\"" } */ +#undef __DATE__ /* { dg-warning "undefining \"__DATE__\"" } */ +#undef __TIME__ /* { dg-warning "undefining \"__TIME__\"" } */ +#undef __FILE__ /* { dg-warning "undefining \"__FILE__\"" } */ #undef __LINE__ /* { dg-warning "undefining \"__LINE__\"" } */ #undef __STDC__ /* { dg-warning "undefining \"__STDC__\"" } */ diff --git a/gcc/testsuite/gcc.dg/cpp/warn-redefined-2.c b/gcc/testsuite/gcc.dg/cpp/warn-redefined-2.c index ea5ad8170cd83..3e2e57a79bbc9 100644 --- a/gcc/testsuite/gcc.dg/cpp/warn-redefined-2.c +++ b/gcc/testsuite/gcc.dg/cpp/warn-redefined-2.c @@ -6,13 +6,13 @@ // { dg-bogus "__TIME__ builtin is not defined" "no-time" { target *-*-* } .-1 } #endif -#define __TIME__ "X" // { dg-error "-:\"__TIME__\" redefined .-Werror=builtin-macro-redefined." } +#define __TIME__ "X" // { dg-error "\"__TIME__\" redefined .-Werror=builtin-macro-redefined." } #define __TIME__ "Y" // { dg-bogus "-Wbuiltin-macro-redefined" } - // { dg-warning "-:\"__TIME__\" redefined" "not-builtin-1" { target *-*-* } .-1 } - // { dg-message "-:previous definition" "previous-1" { target *-*-* } 9 } + // { dg-warning "\"__TIME__\" redefined" "not-builtin-1" { target *-*-* } .-1 } + // { dg-message "previous definition" "previous-1" { target *-*-* } 9 } #define X "X" #define X "Y" // { dg-bogus "-Wbuiltin-macro-redefined" } - // { dg-warning "-:\"X\" redefined" "not-builtin-2" { target *-*-* } .-1 } - // { dg-message "-:previous definition" "previous-2" { target *-*-* } 15 } + // { dg-warning "\"X\" redefined" "not-builtin-2" { target *-*-* } .-1 } + // { dg-message "previous definition" "previous-2" { target *-*-* } 15 } diff --git a/gcc/testsuite/gcc.dg/cpp/warn-redefined.c b/gcc/testsuite/gcc.dg/cpp/warn-redefined.c index e04466897067b..c562d072e402c 100644 --- a/gcc/testsuite/gcc.dg/cpp/warn-redefined.c +++ b/gcc/testsuite/gcc.dg/cpp/warn-redefined.c @@ -6,13 +6,13 @@ // { dg-bogus "__TIME__ builtin is not defined" "no-time" { target *-*-* } .-1 } #endif -#define __TIME__ "X" // { dg-warning "-:\"__TIME__\" redefined .-Wbuiltin-macro-redefined." } +#define __TIME__ "X" // { dg-warning "\"__TIME__\" redefined .-Wbuiltin-macro-redefined." } #define __TIME__ "Y" // { dg-bogus "-Wbuiltin-macro-redefined" } - // { dg-warning "-:\"__TIME__\" redefined" "not-builtin-1" { target *-*-* } .-1 } - // { dg-message "-:previous definition" "previous-1" { target *-*-* } 9 } + // { dg-warning "\"__TIME__\" redefined" "not-builtin-1" { target *-*-* } .-1 } + // { dg-message "previous definition" "previous-1" { target *-*-* } 9 } #define X "X" #define X "Y" // { dg-bogus "-Wbuiltin-macro-redefined" } - // { dg-warning "-:\"X\" redefined" "not-builtin-2" { target *-*-* } .-1 } - // { dg-message "-:previous definition" "previous-2" { target *-*-* } 15 } + // { dg-warning "\"X\" redefined" "not-builtin-2" { target *-*-* } .-1 } + // { dg-message "previous definition" "previous-2" { target *-*-* } 15 } diff --git a/gcc/testsuite/gcc.dg/cpp/warn-unused-macros-2.c b/gcc/testsuite/gcc.dg/cpp/warn-unused-macros-2.c index f82d67fe9c28f..7c3efe0535191 100644 --- a/gcc/testsuite/gcc.dg/cpp/warn-unused-macros-2.c +++ b/gcc/testsuite/gcc.dg/cpp/warn-unused-macros-2.c @@ -1,4 +1,4 @@ // { dg-do preprocess } // { dg-options "-std=gnu99 -fdiagnostics-show-option -Werror=unused-macros" } /* { dg-message "some warnings being treated as errors" "" {target "*-*-*"} 0 } */ -#define X X // { dg-error "-:macro \"X\" is not used .-Werror=unused-macros." } +#define X X // { dg-error "9:macro \"X\" is not used .-Werror=unused-macros." } diff --git a/gcc/testsuite/gcc.dg/cpp/warn-unused-macros.c b/gcc/testsuite/gcc.dg/cpp/warn-unused-macros.c index b18f506b13b68..74df23971a968 100644 --- a/gcc/testsuite/gcc.dg/cpp/warn-unused-macros.c +++ b/gcc/testsuite/gcc.dg/cpp/warn-unused-macros.c @@ -1,4 +1,4 @@ // { dg-do preprocess } // { dg-options "-std=gnu99 -fdiagnostics-show-option -Wunused-macros" } -#define X X // { dg-warning "-:macro \"X\" is not used .-Wunused-macros." } +#define X X // { dg-warning "9:macro \"X\" is not used .-Wunused-macros." } diff --git a/libcpp/directives.cc b/libcpp/directives.cc index 1fdd73edcb869..ee5419d1f4096 100644 --- a/libcpp/directives.cc +++ b/libcpp/directives.cc @@ -655,6 +655,10 @@ do_define (cpp_reader *pfile) if (node) { + /* This is a better location than pfile->directive_line to store + as the macro location. */ + const location_t name_loc = cpp_diagnostic_get_current_location (pfile); + /* If we have been requested to expand comments into macros, then re-enable saving of comments. */ pfile->state.save_comments = @@ -663,7 +667,7 @@ do_define (cpp_reader *pfile) if (pfile->cb.before_define) pfile->cb.before_define (pfile); - if (_cpp_create_definition (pfile, node)) + if (_cpp_create_definition (pfile, node, name_loc)) if (pfile->cb.define) pfile->cb.define (pfile, pfile->directive_line, node); @@ -694,9 +698,8 @@ do_undef (cpp_reader *pfile) "undefining \"%s\"", NODE_NAME (node)); else if (cpp_builtin_macro_p (node) && CPP_OPTION (pfile, warn_builtin_macro_redefined)) - cpp_warning_with_line (pfile, CPP_W_BUILTIN_MACRO_REDEFINED, - pfile->directive_line, 0, - "undefining \"%s\"", NODE_NAME (node)); + cpp_warning (pfile, CPP_W_BUILTIN_MACRO_REDEFINED, + "undefining \"%s\"", NODE_NAME (node)); if (node->value.macro && CPP_OPTION (pfile, warn_unused_macros)) @@ -2642,7 +2645,7 @@ cpp_pop_definition (cpp_reader *pfile, struct def_pragma_macro *c) { _cpp_clean_line (pfile); nbuf->sysp = 1; - if (!_cpp_create_definition (pfile, h)) + if (!_cpp_create_definition (pfile, h, 0)) abort (); _cpp_pop_buffer (pfile); } diff --git a/libcpp/internal.h b/libcpp/internal.h index 9724676a8cd47..8b74d10c1a346 100644 --- a/libcpp/internal.h +++ b/libcpp/internal.h @@ -686,7 +686,7 @@ inline bool _cpp_maybe_notify_macro_use (cpp_reader *pfile, cpp_hashnode *node, } extern cpp_macro *_cpp_new_macro (cpp_reader *, cpp_macro_kind, void *); extern void _cpp_free_definition (cpp_hashnode *); -extern bool _cpp_create_definition (cpp_reader *, cpp_hashnode *); +extern bool _cpp_create_definition (cpp_reader *, cpp_hashnode *, location_t); extern void _cpp_pop_context (cpp_reader *); extern void _cpp_push_text_context (cpp_reader *, cpp_hashnode *, const unsigned char *, size_t); diff --git a/libcpp/macro.cc b/libcpp/macro.cc index d4238d4f62186..dada8fea8350a 100644 --- a/libcpp/macro.cc +++ b/libcpp/macro.cc @@ -3819,7 +3819,8 @@ _cpp_new_macro (cpp_reader *pfile, cpp_macro_kind kind, void *placement) /* Parse a macro and save its expansion. Returns nonzero on success. */ bool -_cpp_create_definition (cpp_reader *pfile, cpp_hashnode *node) +_cpp_create_definition (cpp_reader *pfile, cpp_hashnode *node, + location_t name_loc) { cpp_macro *macro; @@ -3831,6 +3832,13 @@ _cpp_create_definition (cpp_reader *pfile, cpp_hashnode *node) if (!macro) return false; + /* _cpp_new_macro () has set macro->line to pfile->directive_line, which + denotes the line containing the #define with no column information. If + provided, change to name_loc, which will be the token src_loc for the + macro name, including the location and range information. */ + if (name_loc) + macro->line = name_loc; + if (cpp_macro_p (node)) { if (CPP_OPTION (pfile, warn_unused_macros)) @@ -3844,7 +3852,7 @@ _cpp_create_definition (cpp_reader *pfile, cpp_hashnode *node) bool warned = cpp_pedwarning_with_line (pfile, reason, - pfile->directive_line, 0, + macro->line, 0, "\"%s\" redefined", NODE_NAME (node)); if (warned && cpp_user_macro_p (node)) diff --git a/libcpp/pch.cc b/libcpp/pch.cc index 595afefab74d4..a9f4ff19bf1e1 100644 --- a/libcpp/pch.cc +++ b/libcpp/pch.cc @@ -838,7 +838,7 @@ cpp_read_state (cpp_reader *r, const char *name, FILE *f, != NULL) { _cpp_clean_line (r); - if (!_cpp_create_definition (r, h)) + if (!_cpp_create_definition (r, h, 0)) abort (); _cpp_pop_buffer (r); }