From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 973FE3858C3A for ; Fri, 23 Jun 2023 14:44:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 973FE3858C3A Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687531456; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=t2QnXbmIiqZ8zr/FD7TVr9j+Gy0WcxxUBPqgylm/afc=; b=ADd4vLLLlrYVbSW9wGKmpwlOwHdi2Fvm8RRb3S3jcYQ31DFG+XZkAbrZGm+lq9EHxlEAQ6 uQ62E+hisUz15snbsbKOqIqzRw+p2qsfVAGmqu7uORhRAyWzGNE1lm/mSEpU6dXbboJfJj o8lCZpIR5mD2WwXp+ofL2wvRUg3Ba9o= Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-19-2ycxnKMoN5KnPwnKvv2SFg-1; Fri, 23 Jun 2023 10:44:13 -0400 X-MC-Unique: 2ycxnKMoN5KnPwnKvv2SFg-1 Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-62fe5a90439so9417086d6.1 for ; Fri, 23 Jun 2023 07:44:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687531453; x=1690123453; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=t2QnXbmIiqZ8zr/FD7TVr9j+Gy0WcxxUBPqgylm/afc=; b=LmA9ztfiuWx0YsBavtpg/O81SSmRN/Owe5hnGTszswWDZ5ogqAVsIz1j/w+bmLr0uG ExM9BktG5f7WvMfh8lyBKEZRnGRFt2loXuar6QYTJLMPOAV4c4PodX4uqpjix//G41Z6 qOJc0wCPxWs447nc0kn9nFD0YdgfpcGoatJGvTmaIzozTJCEluLZop5t8A9KSQROx+sa +k52maeJRg7WG42MhzC7mk2FQEJZu7sfEVa555dcE92B0ObSQDpyqki0U7qKXqOo0eRe 9sDKe4eGTTDV4BZ9by8MHZUh1qgJYvkLx4dEHIEoEsrS1zFUcDGWMzkln4LzdiYKX4b+ hf1g== X-Gm-Message-State: AC+VfDyqwHTeET78K0oZ7dQxb3iNWym0PKRGEwD+XDA9mrEvtPnKs0Pz 8W4s4F/a6SMJSVVNCpER8AYW1/EoEOtUqSXa3upLoJgYo1LO8m3TxxMTU6obxSBew0rVteF6A0D 77cAuN2rd9BfU X-Received: by 2002:a05:6214:19e6:b0:630:7d0:56f4 with SMTP id q6-20020a05621419e600b0063007d056f4mr23627580qvc.49.1687531453327; Fri, 23 Jun 2023 07:44:13 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ44EVcYHJZ0KvtBANLn5muoFUhKZackgkVNqEEpUHWbM6ISi//nTvliDjeKYDgujz+Pv0CBDg== X-Received: by 2002:a05:6214:19e6:b0:630:7d0:56f4 with SMTP id q6-20020a05621419e600b0063007d056f4mr23627555qvc.49.1687531452935; Fri, 23 Jun 2023 07:44:12 -0700 (PDT) Received: from [192.168.1.108] (130-44-146-16.s12558.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.146.16]) by smtp.gmail.com with ESMTPSA id m17-20020a0cf191000000b00631ecb1052esm5100531qvl.74.2023.06.23.07.44.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 23 Jun 2023 07:44:12 -0700 (PDT) Message-ID: Date: Fri, 23 Jun 2023 10:44:11 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Subject: Re: [PATCH v5 5/5] c++modules: report module mapper files as a dependency To: Ben Boeckel , gcc-patches@gcc.gnu.org Cc: nathan@acm.org, fortran@gcc.gnu.org, gcc@gcc.gnu.org, brad.king@kitware.com References: <20230125210636.2960049-1-ben.boeckel@kitware.com> <20230125210636.2960049-6-ben.boeckel@kitware.com> From: Jason Merrill In-Reply-To: <20230125210636.2960049-6-ben.boeckel@kitware.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On 1/25/23 16:06, Ben Boeckel wrote: > It affects the build, and if used as a static file, can reliably be > tracked using the `-MF` mechanism. Hmm, this seems a bit like making all .o depend on the Makefile; it shouldn't be necessary to rebuild all TUs that use modules when we add another module to the mapper file. What is your expected use case for this dependency? > 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)