From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qv1-xf31.google.com (mail-qv1-xf31.google.com [IPv6:2607:f8b0:4864:20::f31]) by sourceware.org (Postfix) with ESMTPS id 959AE3858D35 for ; Sat, 11 Nov 2023 01:17:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 959AE3858D35 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 959AE3858D35 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::f31 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699665437; cv=none; b=T1FeS0ZbOq+AEfOPQgyrSbcZi71vb9T+rE9VScK0xhlmvOb2sf2NXq9jgAY3nKqOtYJBZY2ZDPm8Bqh2xzOwzCmOotM5BhRxI20/9spc54bIBFWpyK3q5QRoZ+RV4KBl2TOgLWqwjjhGXkjeQ1MTlaTl+6kQaMSrhML/rOJpkEA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699665437; c=relaxed/simple; bh=1tnmhSusVpeAZIBUZ0JliCD4PX5WMOTKa7kEtnTLGzM=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=SSThMxzfa7tpOJZNTzXzaGetiyXZNArWkHcF9pAplhW/ymaG4DsLNlt7QgUhvBQoQ+t/E+kZgCmgJoD5gpWL+hzRr5Clzx7l3LotwFN+ezsaoe97Fmag9DCv0pC1OmoQ2tHAfTwiIec6WV2xgG1H7WW1IGhtlzu4tBmyEXu/WIg= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-qv1-xf31.google.com with SMTP id 6a1803df08f44-6711dd6595fso15078376d6.3 for ; Fri, 10 Nov 2023 17:17:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699665435; x=1700270235; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=XyXX5l725y46Va5X7NJwvtxybQq0iZxYioxPNjkOwyo=; b=XTIHsrGc0ls/1qJaAgMkeciP5z4/dCWMhua0MNIopo5qQldfvGNI1/x/Dde9G+zRpD VsVHSg5AkWSVD0BhC47xPW1WnTdKKrkm9GSrYbLDWufQxl2HG0iapr8eyTzXQTFEL7pv MtbVzLZ9n0BoMNDdUXaDuofjvZrJUVtc1lCN5LAgS/XRrzmLgTOJHLJGzPIrpy7k4Ifg aeU2renRODiMeq1SUAfOVOKrjIsukh6Grfy+aJI08EUNz+8vrQxG4JFCT0LjIhYI5dcR ekfxNcnVsyq6dQkesGqM0SyOHv429FEOFxVAd77eFmfJ7ioDV+af7KLr72pBWBaTu/2x Eqow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699665435; x=1700270235; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=XyXX5l725y46Va5X7NJwvtxybQq0iZxYioxPNjkOwyo=; b=AtZkUziBqtQhcpbhYBvkpixItWSN5k8hfEMRr4BWcjyH+E6xA/U8CTSl8A13PY9SG6 rIHaQ6nGimid/PsS8q8mXfyfkBODTimYIFmKTKBhlHPO7HBw1LZZrvrjU4FGrdCxmepw Q+jXh9i5HV2DV2oMcDmFPdmZ8JYfr2nxrCzUS0DJv5BrOlbAgkbRs40vJy1Bs9WxK0UP SloYpITICaSirW3hC86SBVZKmDew0biEyNSMSalnyQP/ndNScAexTMnjPjLbWkVHmk0x k9WOqBe46ycKTnR5a/cPF9XqeHzdCxokpeR+geU2YxEM8I0nLinTjV4sI1hyM32/Dosr ljzQ== X-Gm-Message-State: AOJu0Yyyu4sHRVXf/ppdv64tw78l4cABuLESdjWAb2H46fcSdx+gGwmk B/ULBVgulM7iGPnxvX9sUrxUlgwi9NQ= X-Google-Smtp-Source: AGHT+IHW1DLD16ED12O0RsQoWRWgXmSbSvWlPPogGR1khA5hWTdXBo0It7w8S11rAuInW3ZNWSMwpQ== X-Received: by 2002:a0c:fa82:0:b0:65d:afc:3a52 with SMTP id o2-20020a0cfa82000000b0065d0afc3a52mr800494qvn.49.1699665434773; Fri, 10 Nov 2023 17:17:14 -0800 (PST) Received: from localhost.localdomain (96-67-140-173-static.hfc.comcastbusiness.net. [96.67.140.173]) by smtp.gmail.com with ESMTPSA id pl17-20020ad44691000000b0065b29403540sm240193qvb.127.2023.11.10.17.17.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Nov 2023 17:17:14 -0800 (PST) From: Lewis Hyatt To: gcc-patches@gcc.gnu.org Cc: Lewis Hyatt Subject: [PATCH] c-family: Let libcpp know when the compilation is for a PCH [PR9471] Date: Fri, 10 Nov 2023 20:17:09 -0500 Message-Id: <20231111011709.3071117-1-lhyatt@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3038.7 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,KAM_SHORT,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 List-Id: Hello- The PR may be 20 years old, but by now it only needs a one-line fix :). Is it OK please? Bootstrapped + regtested all langauges on x86-64 Linux. Thanks! -Lewis https://gcc.gnu.org/bugzilla/show_bug.cgi?id=9471 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=47857 -- >8 -- libcpp will generate diagnostics when it encounters things in the main file that only belong in a header file, such as `#pragma once' or `#pragma GCC system_header'. But sometimes the main file is a header file that is just being compiled separately, e.g. to produce a C++ module or a PCH, in which case such diagnostics should be suppressed. libcpp already has an interface to request that, so make use of it in the C frontends to prevent libcpp from issuing unwanted diagnostics when compiling a PCH. gcc/c-family/ChangeLog: PR pch/9471 PR pch/47857 * c-opts.cc (c_common_post_options): Set cpp_opts->main_search so libcpp knows it is compiling a header file separately. gcc/testsuite/ChangeLog: PR pch/9471 PR pch/47857 * g++.dg/pch/main-file-warnings.C: New test. * g++.dg/pch/main-file-warnings.Hs: New test. * gcc.dg/pch/main-file-warnings.c: New test. * gcc.dg/pch/main-file-warnings.hs: New test. --- gcc/c-family/c-opts.cc | 3 +++ gcc/testsuite/g++.dg/pch/main-file-warnings.C | 7 +++++++ gcc/testsuite/g++.dg/pch/main-file-warnings.Hs | 3 +++ gcc/testsuite/gcc.dg/pch/main-file-warnings.c | 7 +++++++ gcc/testsuite/gcc.dg/pch/main-file-warnings.hs | 3 +++ 5 files changed, 23 insertions(+) create mode 100644 gcc/testsuite/g++.dg/pch/main-file-warnings.C create mode 100644 gcc/testsuite/g++.dg/pch/main-file-warnings.Hs create mode 100644 gcc/testsuite/gcc.dg/pch/main-file-warnings.c create mode 100644 gcc/testsuite/gcc.dg/pch/main-file-warnings.hs diff --git a/gcc/c-family/c-opts.cc b/gcc/c-family/c-opts.cc index fbabd1816c1..10403c03bd6 100644 --- a/gcc/c-family/c-opts.cc +++ b/gcc/c-family/c-opts.cc @@ -1174,6 +1174,9 @@ c_common_post_options (const char **pfilename) "the %qs debug info cannot be used with " "pre-compiled headers", debug_set_names (write_symbols & ~DWARF2_DEBUG)); + /* Let libcpp know that the main file is a header so it won't + complain about things like #include_next and #pragma once. */ + cpp_opts->main_search = CMS_header; } else if (write_symbols != NO_DEBUG && write_symbols != DWARF2_DEBUG) c_common_no_more_pch (); diff --git a/gcc/testsuite/g++.dg/pch/main-file-warnings.C b/gcc/testsuite/g++.dg/pch/main-file-warnings.C new file mode 100644 index 00000000000..a9e8b0ba9f2 --- /dev/null +++ b/gcc/testsuite/g++.dg/pch/main-file-warnings.C @@ -0,0 +1,7 @@ +/* PR pch/9471 */ +/* PR pch/47857 */ +/* Test will fail if any warnings get issued while compiling the header into a PCH. */ +#include "main-file-warnings.H" +#pragma once /* { dg-warning "in main file" } */ +#pragma GCC system_header /* { dg-warning "outside include file" } */ +#include_next /* { dg-warning "in primary source file" } */ diff --git a/gcc/testsuite/g++.dg/pch/main-file-warnings.Hs b/gcc/testsuite/g++.dg/pch/main-file-warnings.Hs new file mode 100644 index 00000000000..d1582bb8290 --- /dev/null +++ b/gcc/testsuite/g++.dg/pch/main-file-warnings.Hs @@ -0,0 +1,3 @@ +#pragma once /* { dg-bogus "in main file" } */ +#pragma GCC system_header /* { dg-bogus "outside include file" } */ +#include_next /* { dg-bogus "in primary source file" } */ diff --git a/gcc/testsuite/gcc.dg/pch/main-file-warnings.c b/gcc/testsuite/gcc.dg/pch/main-file-warnings.c new file mode 100644 index 00000000000..aedbc15f7ba --- /dev/null +++ b/gcc/testsuite/gcc.dg/pch/main-file-warnings.c @@ -0,0 +1,7 @@ +/* PR pch/9471 */ +/* PR pch/47857 */ +/* Test will fail if any warnings get issued while compiling the header into a PCH. */ +#include "main-file-warnings.h" +#pragma once /* { dg-warning "in main file" } */ +#pragma GCC system_header /* { dg-warning "outside include file" } */ +#include_next /* { dg-warning "in primary source file" } */ diff --git a/gcc/testsuite/gcc.dg/pch/main-file-warnings.hs b/gcc/testsuite/gcc.dg/pch/main-file-warnings.hs new file mode 100644 index 00000000000..d1582bb8290 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pch/main-file-warnings.hs @@ -0,0 +1,3 @@ +#pragma once /* { dg-bogus "in main file" } */ +#pragma GCC system_header /* { dg-bogus "outside include file" } */ +#include_next /* { dg-bogus "in primary source file" } */