From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lj1-x22a.google.com (mail-lj1-x22a.google.com [IPv6:2a00:1450:4864:20::22a]) by sourceware.org (Postfix) with ESMTPS id 126903858C66 for ; Thu, 12 Jan 2023 23:32:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 126903858C66 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-lj1-x22a.google.com with SMTP id s25so20971474lji.2 for ; Thu, 12 Jan 2023 15:32:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=U1DLH7uuskQ+cnbvxnjxpnIVI9nwjD2s/aWnnaXccsE=; b=W+PJyhT/xXpmhdYqgeQn6hbHayd2SfW0jIbdq1nKo1OWU+Z7avigxLqVIDJaefwWPW YEtN6+Q6FXrw4EEtRgZx3+rcT6v7wQ5d18MWHcjPMAxAap1ljuuS6z8Phmz+dps9uBSg 3TYwjVbJqc4D9c6ta2deGgy4pGIeKnjuUJYJCKbaPUI4X9bTyXvFf6FNZdhnhOeQx7DL K6fNVmCWTzFtzX67a6zo7yu2Hqz7A2hNi75uZLZooN9/ya/EriFiI3ohs7ZNAde3zVzG ggP2AtAzB5joRHUBByO0/aNP5k08U/ox76M9KMsh1FDfvKYLzmv15hvSk9y93elW6+dd Ds+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=U1DLH7uuskQ+cnbvxnjxpnIVI9nwjD2s/aWnnaXccsE=; b=q4vbwp0jK1vUMqz51Cu8ThEnCU+Xo78hftcNYLfz5CbvfsWtJehQ1FFajt1umJxIei jkGox+ZFFKkTPXDWHvnA46PQCP2ija18ZUx+Tgv6kpMEwHdrCtqcQ29J2WaWfHrZOHce 53HsMtSMiHB6fJ8cp6OCzGsjkIUmfSmTIfprrB5aot58IiO6SLkou5tEYRtmuW2AqSIL l5NdY4AeCK97zeXl5Tr15CJHHRfxjfNERxitfLvILJ7aoKbuFuGTOkPFF+EMWhLU84JK o5R0K5mTm6y+Ru58v+JcDG8Ibui8QXAgiFDePSwkk1KxxCWE3bFc/mOrvBn0hWghkCm6 kemA== X-Gm-Message-State: AFqh2kqFjpQQtCBErLIHcV3LXvwUavVxWT1emfDo32uYCeWYXYM5bsEB 2ZyXhrMzP24demB700OY0ZROToruFtI28K6mfeyhw4BC X-Google-Smtp-Source: AMrXdXs77ZOLhW6+igva2VvGxFl+id3k1zxmc6xDwOA33V5z3pHRn4V8y4nRdtgv540H7fUZgzX3m11ybybiIVRZl24= X-Received: by 2002:a2e:9794:0:b0:27f:b7fd:7dd with SMTP id y20-20020a2e9794000000b0027fb7fd07ddmr4162216lji.408.1673566325224; Thu, 12 Jan 2023 15:32:05 -0800 (PST) MIME-Version: 1.0 From: Lewis Hyatt Date: Thu, 12 Jan 2023 18:31:53 -0500 Message-ID: Subject: ping: [PATCH] libcpp: Improve location for macro names [PR66290] To: gcc-patches List Cc: Jakub Jelinek Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-3029.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,KAM_SHORT,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: https://gcc.gnu.org/pipermail/gcc-patches/2022-December/607647.html May I please ping this one again? It will enable closing out the PR. Thanks! -Lewis On Thu, Dec 1, 2022 at 9:22 AM Lewis Hyatt wrote: > > Hello- > > https://gcc.gnu.org/pipermail/gcc-patches/2022-August/599397.html > > May I please ping this one? Thanks! > I have also re-attached the rebased patch here. > > -Lewis > > On Wed, Oct 12, 2022 at 06:37:50PM -0400, Lewis Hyatt wrote: > > Hello- > > > > https://gcc.gnu.org/pipermail/gcc-patches/2022-August/599397.html > > > > Since Jeff was kind enough to ack one of my other preprocessor patches > > today, I have become emboldened to ping this one again too :). Would > > anyone have some time to take a look at it please? Thanks! > > > > -Lewis > > > > On Thu, Sep 15, 2022 at 6:31 PM Lewis Hyatt wrote: > > > > > > Hello- > > > > > > https://gcc.gnu.org/pipermail/gcc-patches/2022-August/599397.html > > > May I please ping this patch? Thank you. > > > > > > -Lewis > > > > > > On Fri, Aug 5, 2022 at 12:14 PM Lewis Hyatt wrote: > > > > > > > > > > > > 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. > > > > --- > > > > > > > > Notes: > > > > Hello- > > > > > > > > The PR (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66290) was originally > > > > about the entirely wrong location for -Wunused-macros in C++ mode, which > > > > behavior was fixed by r13-1903, but before closing it out I wanted to also > > > > address a second point brought up in the PR comments, namely that we do not > > > > include column information when emitting diagnostics for macro names, such as > > > > is done for -Wunused-macros. The attached patch updates the location stored in > > > > the cpp_macro object so that it includes the column and range information for > > > > the token comprising the macro name; previously, the location was just the > > > > generic one pointing to the whole line. > > > > > > > > The change to libcpp is very small, the reason for all the testsuite changes is > > > > that I have updated all tests explicitly looking for the columnless diagnostics > > > > (with the "-:" syntax to dg-warning et al) so that they expect a column > > > > instead. I also added a new test which verifies the expected range information > > > > in diagnostics with carets. > > > > > > > > Bootstrap + regtest on x86-64 Linux looks good. Please let me know if it looks > > > > OK? Thanks! > > > > > > > > -Lewis > > > > > > > > libcpp/directives.cc | 13 +- > > > > libcpp/internal.h | 2 +- > > > > libcpp/macro.cc | 12 +- > > > > libcpp/pch.cc | 2 +- > > > > gcc/testsuite/c-c++-common/cpp/line-2.c | 2 +- > > > > gcc/testsuite/c-c++-common/cpp/line-3.c | 2 +- > > > > .../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 +- > > > > .../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.dg/cpp/warn-unused-macros-2.c | 2 +- > > > > gcc/testsuite/gcc.dg/cpp/warn-unused-macros.c | 2 +- > > > > 29 files changed, 405 insertions(+), 342 deletions(-) > > > > create mode 100644 gcc/testsuite/c-c++-common/cpp/macro-ranges.c > > > >