From patchwork Wed Nov 27 04:48:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 101945 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 708943857C78 for ; Wed, 27 Nov 2024 04:51:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 708943857C78 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Jp8lwbzE X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTP id 1476A3857BA0 for ; Wed, 27 Nov 2024 04:49:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1476A3857BA0 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 1476A3857BA0 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1732682949; cv=none; b=sJj2Nvpe+nnH3cEzTNXaUXQQGhV0t10XEtalhwfBPEQu3DswocYEvl5bRNWJ56i2j52RxgaB92egzMnX1Kcem2jfl32vlZugTQWHJUMSPobIR2UvvbjsaCbCVIte4h9MUTUBay+4xZeB/IOJUQXluApGqh7WW2RcS023iNaqcT4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1732682949; c=relaxed/simple; bh=kiLxD50n6saC6c4F/Rsi+EglCxvj/w7PikO2nSCN9VE=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=c+V6xj9Y8H4ya502I0wr0afjBRgMvn/bcgnLCVIOkMp+jfT7kdxbWBp2KU+AMURq1WkgI1L3c58CY0Qus/aqkTobu5Qs2QpEvXkptejMwoFiC8anTZFuV0qtG0oozlo4BeeIsdv77skk5Dfb1Smq08RmP6Zh6PQJzWhxQEP4f4g= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1476A3857BA0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732682948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kuSE6IyudsFSnNRlcKrYbip1+URrnD5CKEY1O6m4CxY=; b=Jp8lwbzExjm6B8ITj7lqAEFyPGmuZwv/ZmDBEg7DqjFFNcHRGk/BJqbLRkbitqwoGplugb +Bp4VZitsSAwfzo323hOk3met51VZMIvERgv9O0l5fGl9je7G7/HlSJGtyQP0y4VHplQmx QSbne18ihT4NshtKANZ6PHqSy+K077A= Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-65-wAKZRwF9NquoCqwSNItEyQ-1; Tue, 26 Nov 2024 23:49:06 -0500 X-MC-Unique: wAKZRwF9NquoCqwSNItEyQ-1 X-Mimecast-MFC-AGG-ID: wAKZRwF9NquoCqwSNItEyQ Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-7b6676f4361so317960885a.3 for ; Tue, 26 Nov 2024 20:49:06 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732682945; x=1733287745; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=kuSE6IyudsFSnNRlcKrYbip1+URrnD5CKEY1O6m4CxY=; b=PhgFCzi6xurw1Xj8FtL6NkJqH1ao5nC5tgPgVWijJCaS3Khg5j++KoFVrNjB6TnOpv uJw/Rb9kUSgNmmNfFOCvXYUxV3cyyD7gvDGJXOzYhOgIRrhlH8l9MzFOsbfOeiFGfUlN 9OlSqUw/LeDQpLm2KD7QdZTjczqJUcCaiZxngGSU+nivfv5CIEX/4Qw/ZyxbIfuPCnfy QoKlSrQ9LRVs3FUY2U2XIU/o5qJbYzY3owcw0tRi7KnSnp8TzKWLf7X6mlOQBk54nhYM 3RUYM/Uz9eWEiCEmudrtOawgXTy9tyDLm/W9Mp3rOhZ7MmPET7O4JE5qalueZygso/Lc xJGQ== X-Gm-Message-State: AOJu0YxOjvhCplLrWuJw0FP8GVpZSiB0N4oONlWKz3Up51s5XqDOphjf kI8IxASreQpGBk4hyuAhk99HMdK5kkzTRqGh+G323jp4loiiJi+GegFDeVYSzMzZZ8cRujQda40 UMcHejrR1AL9tH0SVai+SmVmhB5omWTyEmAIEZlPv6ZFU4vEm/1vUEc+h83hPRKuYUNzHptxvZJ lhsCZSx/I5/JZk0+jaKmDBVUXa2rZ+slMK4KI= X-Gm-Gg: ASbGncsaUx4tmtmFeE/CCBgXT9SJDYsRDSHa29Kjr2J6YGBor5zAqF5rE3IuofWRCj1 74h+k49N7dvX3nYSW/JlEi4pPKN20sMBtQHkeGTLnQDgNn8FBPqN+u+Oh8SUjLyBPu+1aSXGmNN azNkdV9UUp1OM2V07AADaPlLjEMzTLGYwePssbrgPsxeTHQ+hZCui0QZUIGy25dYoH+A0UL91A4 uz7hCwcv201xX+LSi55llMI+Hss8EFjtm/SrzaQHwWRmm17YuEs7IuSLlNbOn+xQ9XNp+BYVwMe Q1WvMt6z9zYu3neOalOBVZw8gt97HKgiP9dA5ykQtT9wAdD5E/QipWQqAtIGZo7RjpISicEp/4O Hjf0= X-Received: by 2002:a05:620a:2692:b0:7b1:453c:56b3 with SMTP id af79cd13be357-7b67c443bf8mr238254185a.38.1732682945572; Tue, 26 Nov 2024 20:49:05 -0800 (PST) X-Google-Smtp-Source: AGHT+IGsGpYX6FoPlrRliMFT825cS2+YMqrYLcCbWsXRyjHETY2fDbBjQxoH/2n/1fxo7fzvkYTBqg== X-Received: by 2002:a05:620a:2692:b0:7b1:453c:56b3 with SMTP id af79cd13be357-7b67c443bf8mr238252785a.38.1732682945144; Tue, 26 Nov 2024 20:49:05 -0800 (PST) Received: from jason-thinkpadp1gen4i.rmtusma.csb (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 af79cd13be357-7b513fa66f9sm525668585a.35.2024.11.26.20.49.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2024 20:49:04 -0800 (PST) From: Jason Merrill To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: modules and local static Date: Tue, 26 Nov 2024 23:48:55 -0500 Message-ID: <20241127044903.3074092-1-jason@redhat.com> X-Mailer: git-send-email 2.47.0 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: SC6KFXveroMxPT_NB9KzVvwRHx6y17Edni_p92JJVFM_1732682946 X-Mimecast-Originator: redhat.com content-type: text/plain; charset="US-ASCII"; x-default=true 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, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, 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.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~patchwork=sourceware.org@gcc.gnu.org Tested x86_64-pc-linux-gnu, applying to trunk. -- 8< -- Here we weren't emitting the guard variable for 'a' when we emitted 'afn' in the importer, because we only treated inline variables as needing that. Fixed by generalizing to vague_linkage_p. But we need to specifically exempt vtables, because the rest of the module code handles them specially and expects them to be DECL_EXTERNAL. gcc/cp/ChangeLog: * module.cc (trees_out::core_bools): Check vague_linkage_p. (has_definition): Likewise. gcc/testsuite/ChangeLog: * g++.dg/modules/static-3_b.C: New test. * g++.dg/modules/static-3_a.H: New test. --- gcc/cp/module.cc | 23 ++++++++++++----------- gcc/testsuite/g++.dg/modules/static-3_b.C | 8 ++++++++ gcc/testsuite/g++.dg/modules/static-3_a.H | 13 +++++++++++++ 3 files changed, 33 insertions(+), 11 deletions(-) create mode 100644 gcc/testsuite/g++.dg/modules/static-3_b.C create mode 100644 gcc/testsuite/g++.dg/modules/static-3_a.H base-commit: 819f67a2f633d2000f09119f0e19b784ea0a4bd8 prerequisite-patch-id: 44b613ffa7552972edb4078fd124f755bb857985 prerequisite-patch-id: 4f6f2295c571a63cb862f9e8c3455c66d41cc2e3 diff --git a/gcc/cp/module.cc b/gcc/cp/module.cc index 617bf4c68b1..5e68bb414cd 100644 --- a/gcc/cp/module.cc +++ b/gcc/cp/module.cc @@ -5490,16 +5490,13 @@ trees_out::core_bools (tree t, bits_out& bits) case VAR_DECL: if (TREE_PUBLIC (t) - && !(TREE_STATIC (t) - && DECL_FUNCTION_SCOPE_P (t) - && DECL_DECLARED_INLINE_P (DECL_CONTEXT (t))) - && !DECL_VAR_DECLARED_INLINE_P (t)) + && DECL_VTABLE_OR_VTT_P (t)) + /* We handle vtable linkage specially. */ is_external = true; - break; - + gcc_fallthrough (); case FUNCTION_DECL: if (TREE_PUBLIC (t) - && !DECL_DECLARED_INLINE_P (t)) + && !vague_linkage_p (t)) is_external = true; break; } @@ -11919,11 +11916,15 @@ has_definition (tree decl) since there's no TU to emit them in otherwise. */ return true; - if (!decl_maybe_constant_var_p (decl) - && !DECL_INLINE_VAR_P (decl)) - return false; + if (decl_maybe_constant_var_p (decl)) + /* We might need its constant value. */ + return true; - return true; + if (vague_linkage_p (decl)) + /* These are emitted as needed. */ + return true; + + return false; } break; diff --git a/gcc/testsuite/g++.dg/modules/static-3_b.C b/gcc/testsuite/g++.dg/modules/static-3_b.C new file mode 100644 index 00000000000..70180f8eb32 --- /dev/null +++ b/gcc/testsuite/g++.dg/modules/static-3_b.C @@ -0,0 +1,8 @@ +// { dg-additional-options -fmodules } + +import "static-3_a.H"; + +int main() +{ + afn(); +} diff --git a/gcc/testsuite/g++.dg/modules/static-3_a.H b/gcc/testsuite/g++.dg/modules/static-3_a.H new file mode 100644 index 00000000000..e5a014e9373 --- /dev/null +++ b/gcc/testsuite/g++.dg/modules/static-3_a.H @@ -0,0 +1,13 @@ +// { dg-additional-options -fmodules } +// { dg-module-do link } + +inline int i; + +struct A { + A() { ++i; } +}; + +inline A& afn() { + static A a; + return a; +}