From patchwork Wed Jan 25 21:06:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Boeckel X-Patchwork-Id: 48358 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp489195wrn; Wed, 25 Jan 2023 13:16:01 -0800 (PST) X-Google-Smtp-Source: AMrXdXsgYVchiooc4Y/UireUy77jsSyLhoBPgxjcwVL1XXneAFYjG9EPSvityIiiTOZiq7rK2LUC X-Received: by 2002:a05:6402:197:b0:481:420e:206d with SMTP id r23-20020a056402019700b00481420e206dmr33348990edv.42.1674681361540; Wed, 25 Jan 2023 13:16:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674681361; cv=none; d=google.com; s=arc-20160816; b=SUNF9D+dABMaOqKzZDdMhbuFesZ4iyofeSKnAhvvZpbCRPZ06I4xZBp6uVmuy41w+q fo9BkaChv2N6wZDqUPr25wEbHxTHr3Ws5sQ5CEJ0TqfkGSTCYQCk7WWqswyHh4h029zt p3EPKDrQbJ/Mu86y97kmQu0kP1l06EUXAvj/Q4XUNExUVTEZYInEAdXIsZ/IqZ+zTP4z m8qomQvslNNsHSPzw/0rHSy3Yi6fr6D244ua9kWnpc1NB067xHpliTvA+xL3EHUzffR1 MJZCPuAD4YSNPxJEWfZSvj41E3OoV/GBpsdfPlMwWLQnyVhQYxGGJ4k3IMusvOJ7TxoV JrDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:dmarc-filter:delivered-to :dkim-signature:dkim-filter; bh=9+3ugTPRjr02ZMAt1Rz+LRynl7kpyOjtvemHbn0fius=; b=pghJZo6n7+VJDVYCKtZml5LchOWA0hWjUwCxFklGi+cepBn30mYEBYqI4zthvGL7uf l7xqPEEIlnDmFcp7XtRoj07ETok4f0R/yvcqVzJzcCVpx4ZCJnKBJBG2nwoK3ku4p0iM nBkbakcQmamOvyLpjLLZLIE4gc74ygdvnFGLYNUIzj+vvqiKPAOLEpn7VSLm9IwAKzbU H4kaNTrdYcQjAP9+QXFwpn4AKN/Vj45BlJBWyx73HEXBT0RkENvjL1DYs3/J8H2y3it4 BqhjXfUy7Jd6zCRPTF+NiqqWVMSbS6tH7nBFhNq7b5y5yYMfrs3laYTbyfRlH5VFxPup 5n3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=QCCjwwPU; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id o5-20020aa7dd45000000b0047b5ecde3d7si7238745edw.257.2023.01.25.13.16.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Jan 2023 13:16:01 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=QCCjwwPU; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E7C643887F79 for ; Wed, 25 Jan 2023 21:09:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E7C643887F79 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1674680997; bh=9+3ugTPRjr02ZMAt1Rz+LRynl7kpyOjtvemHbn0fius=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=QCCjwwPUtPqFHT4chOGpoWx1YKW11fAvYHWPsFD3xUpqhl4RZpBkFy3KlOXvdjqzL vG1ZZ2IAu7u68wQ89XDs+G6JbYaCQqemz54Nkjwwko78PaSmkEPyIOZgINjbFcHyBi 8yYkxkgvLF2NpazIUR+JhhryOlwZE5XEGu1/7bdc= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-qt1-x82d.google.com (mail-qt1-x82d.google.com [IPv6:2607:f8b0:4864:20::82d]) by sourceware.org (Postfix) with ESMTPS id E87323858423 for ; Wed, 25 Jan 2023 21:06:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E87323858423 Received: by mail-qt1-x82d.google.com with SMTP id o5so17170906qtr.11 for ; Wed, 25 Jan 2023 13:06:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9+3ugTPRjr02ZMAt1Rz+LRynl7kpyOjtvemHbn0fius=; b=s5HfI80i2TO6HR4W0TjzfuE0rH1Ox9gA2sO1mSPVDsOjQUR1mXFZduNch62hIG1LmT 6VNKkhpvUJmY1VaDYHKtPDOpj0o9x29JMmgh9ispFjYLo8AyyVAF19S0CBP1sT7S1FNf Eci8LZLuyCPb7jG9NyRdovdbMsrcFvXYPeSk7yE6YnRKwFx+91/cAQetghBixMoX98eO CU11APFUw4DlAygPc8w/6kJbN+eXVsFWKiAjFNrNv/YQdw2xHB70c7LwoVtcVBz112Bw IxSCDEWPPHfErNMxFSzP9ysP9xn5c15e0SrxeL5z5ZYrHEgaixKvxmuWtYS0xmj1owsU ri2w== X-Gm-Message-State: AFqh2kp1uioZgCbXM2LfhpQxOT2UXo2G0hti2UBC2u/v4BDqyFZYann1 vD4UVajahkgqFINlheu+uhBtNzPaDKPPKY55BsU= X-Received: by 2002:ac8:4914:0:b0:3b6:2e1d:4a11 with SMTP id e20-20020ac84914000000b003b62e1d4a11mr50131074qtq.22.1674680819635; Wed, 25 Jan 2023 13:06:59 -0800 (PST) Received: from localhost (cpe-142-105-146-128.nycap.res.rr.com. [142.105.146.128]) by smtp.gmail.com with ESMTPSA id r12-20020ac867cc000000b003b7e8c04d2esm3912853qtp.64.2023.01.25.13.06.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Jan 2023 13:06:59 -0800 (PST) To: gcc-patches@gcc.gnu.org Cc: Ben Boeckel , jason@redhat.com, nathan@acm.org, fortran@gcc.gnu.org, gcc@gcc.gnu.org, brad.king@kitware.com Subject: [PATCH v5 5/5] c++modules: report module mapper files as a dependency Date: Wed, 25 Jan 2023 16:06:36 -0500 Message-Id: <20230125210636.2960049-6-ben.boeckel@kitware.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230125210636.2960049-1-ben.boeckel@kitware.com> References: <20230125210636.2960049-1-ben.boeckel@kitware.com> MIME-Version: 1.0 X-Spam-Status: No, score=-11.9 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 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Ben Boeckel via Gcc-patches From: Ben Boeckel Reply-To: Ben Boeckel Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756030683229982230?= X-GMAIL-MSGID: =?utf-8?q?1756030683229982230?= It affects the build, and if used as a static file, can reliably be tracked using the `-MF` mechanism. gcc/cp/: * mapper-client.cc, mapper-client.h (open_module_client): Accept dependency tracking and track module mapper files as dependencies. * module.cc (make_mapper, get_mapper): Pass the dependency tracking class down. Signed-off-by: Ben Boeckel --- gcc/cp/mapper-client.cc | 4 ++++ gcc/cp/mapper-client.h | 1 + gcc/cp/module.cc | 18 +++++++++--------- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/gcc/cp/mapper-client.cc b/gcc/cp/mapper-client.cc index 39e80df2d25..0ce5679d659 100644 --- a/gcc/cp/mapper-client.cc +++ b/gcc/cp/mapper-client.cc @@ -34,6 +34,7 @@ along with GCC; see the file COPYING3. If not see #include "diagnostic-core.h" #include "mapper-client.h" #include "intl.h" +#include "mkdeps.h" #include "../../c++tools/resolver.h" @@ -132,6 +133,7 @@ spawn_mapper_program (char const **errmsg, std::string &name, module_client * module_client::open_module_client (location_t loc, const char *o, + class mkdeps *deps, void (*set_repo) (const char *), char const *full_program_name) { @@ -285,6 +287,8 @@ module_client::open_module_client (location_t loc, const char *o, errmsg = "opening"; else { + /* Add the mapper file to the dependency tracking. */ + deps_add_dep (deps, name.c_str ()); if (int l = r->read_tuple_file (fd, ident, false)) { if (l > 0) diff --git a/gcc/cp/mapper-client.h b/gcc/cp/mapper-client.h index b32723ce296..a3b0b8adc51 100644 --- a/gcc/cp/mapper-client.h +++ b/gcc/cp/mapper-client.h @@ -55,6 +55,7 @@ public: public: static module_client *open_module_client (location_t loc, const char *option, + class mkdeps *, void (*set_repo) (const char *), char const *); static void close_module_client (location_t loc, module_client *); diff --git a/gcc/cp/module.cc b/gcc/cp/module.cc index dbd1b721616..37066bf072b 100644 --- a/gcc/cp/module.cc +++ b/gcc/cp/module.cc @@ -3969,12 +3969,12 @@ static GTY(()) vec *partial_specializations; /* Our module mapper (created lazily). */ module_client *mapper; -static module_client *make_mapper (location_t loc); -inline module_client *get_mapper (location_t loc) +static module_client *make_mapper (location_t loc, class mkdeps *deps); +inline module_client *get_mapper (location_t loc, class mkdeps *deps) { auto *res = mapper; if (!res) - res = make_mapper (loc); + res = make_mapper (loc, deps); return res; } @@ -14031,7 +14031,7 @@ get_module (const char *ptr) /* Create a new mapper connecting to OPTION. */ module_client * -make_mapper (location_t loc) +make_mapper (location_t loc, class mkdeps *deps) { timevar_start (TV_MODULE_MAPPER); const char *option = module_mapper_name; @@ -14039,7 +14039,7 @@ make_mapper (location_t loc) option = getenv ("CXX_MODULE_MAPPER"); mapper = module_client::open_module_client - (loc, option, &set_cmi_repo, + (loc, option, deps, &set_cmi_repo, (save_decoded_options[0].opt_index == OPT_SPECIAL_program_name) && save_decoded_options[0].arg != progname ? save_decoded_options[0].arg : nullptr); @@ -19503,7 +19503,7 @@ maybe_translate_include (cpp_reader *reader, line_maps *lmaps, location_t loc, dump.push (NULL); dump () && dump ("Checking include translation '%s'", path); - auto *mapper = get_mapper (cpp_main_loc (reader)); + auto *mapper = get_mapper (cpp_main_loc (reader), cpp_get_deps (reader)); size_t len = strlen (path); path = canonicalize_header_name (NULL, loc, true, path, len); @@ -19619,7 +19619,7 @@ module_begin_main_file (cpp_reader *reader, line_maps *lmaps, static void name_pending_imports (cpp_reader *reader) { - auto *mapper = get_mapper (cpp_main_loc (reader)); + auto *mapper = get_mapper (cpp_main_loc (reader), cpp_get_deps (reader)); if (!vec_safe_length (pending_imports)) /* Not doing anything. */ @@ -20089,7 +20089,7 @@ init_modules (cpp_reader *reader) if (!flag_module_lazy) /* Get the mapper now, if we're not being lazy. */ - get_mapper (cpp_main_loc (reader)); + get_mapper (cpp_main_loc (reader), cpp_get_deps (reader)); if (!flag_preprocess_only) { @@ -20299,7 +20299,7 @@ late_finish_module (cpp_reader *reader, module_processing_cookie *cookie, if (!errorcount) { - auto *mapper = get_mapper (cpp_main_loc (reader)); + auto *mapper = get_mapper (cpp_main_loc (reader), cpp_get_deps (reader)); mapper->ModuleCompiled (state->get_flatname ()); } else if (cookie->cmi_name)