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 F20313858D33 for ; Wed, 25 Oct 2023 18:32:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org F20313858D33 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 F20313858D33 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=1698258776; cv=none; b=LBViu/KyvAnGlqqvqt13fdZXGbfs9bIaVE95WLzKONI1ePt09RnIy1ZQs5ePDFBLW92fVlLMd3TmnCxJiEkNVSlOht7y1V9dMDans83AGcb/r3iODuc2ObEv+o8yPY2/mJBXP+Pkq3ClRTHfIC3NzeQ+DpdDVp05r1iNuyi+OQE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698258776; c=relaxed/simple; bh=up4EO1TxqUwZwL+8oPWsVBbyil+sea28N1hrhxsuGtA=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=e5XddD4ay6895iHq2Boa7zKQeCzSbaPDO629QcSH6OIoaR/fIRjMUd8+ivvQd6kZTG52yoaHkfkcPR5wqeEbXqSiuW6mqRQ8G0Bg9UXlkv+AMX3zJfWsnerjY4mQs9oOFk8MUauNs/XRsqGkrwE2iKqSfhmQkURarrAzvtlhCWE= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698258774; 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; bh=5fhCcs+6w+JIsewdEpGSim6029Dj5E9SfmDpqLRlz+Y=; b=aIjNM+bPxspaEVTJ08H+nzOmj7HLk0pB2/9VLKM3q7xuzq1dgLB4TZLro8fe1UlTntIYlH 99wfSml+bSd1nX0osIG6Sklz6hfr0NJ8f5UBg50wvCBMB385ar65DCHabSzrArRKFe3dgk exWE3I7UKW+OUidsDNWRI4zPC5/7voo= Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-85-nDn7ztl2Ovm4LIXA8o_ggA-1; Wed, 25 Oct 2023 14:32:53 -0400 X-MC-Unique: nDn7ztl2Ovm4LIXA8o_ggA-1 Received: by mail-qt1-f200.google.com with SMTP id d75a77b69052e-41cd46aa351so1059401cf.3 for ; Wed, 25 Oct 2023 11:32:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698258772; x=1698863572; 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=5fhCcs+6w+JIsewdEpGSim6029Dj5E9SfmDpqLRlz+Y=; b=OlHNEaNPzrWYJaZ+HDNq8jPabUscj5hUdPQT/Rz0npcezVZey1Eqg8h3A0Iwyb5cl1 IU//S/wSmSBA7rXpHQWL2gfB7pTcZ1CUkJoUzpIdVPdWcivCUvkR0BrgaoUsH5JygOzI bqtmENJ1b74I/b1GasphNUWfYRk3eB9pWdl99K0UCbwrz+999SRNqgbuLEeBvbaFluI3 /gwCG49TXivVVdSGnYfSS7nRd9q9E0tqUu4rbUqcycO4HCgmgX5D6dkks4OlqOFakpdS DllkyttIZBM5no0bsoX30LPdxiR5aDr6PT0yYOQFmF6n15c3fjjbB5O3DFQu8L2SEZPk WvWw== X-Gm-Message-State: AOJu0Yw1/wtK3txZ9HsvZ+6R1r51IlAy1zLBMPt81me2/wH2r1k2yb2p Qn+AI78fSxxQhRf2NwQMllaCo3pU9V9Q9OixNP6gRvYWfl5wvqKCLM9+jB0rfytJcUkEPPBr0d9 XrdEqvWusPsx7mITWAJmwqM8NJEuHDva1TO1X8VURvChvc0PgpDLXr9yrFFiWmlhfffiKFKkFIl I= X-Received: by 2002:ac8:57d3:0:b0:41c:c60c:7c1f with SMTP id w19-20020ac857d3000000b0041cc60c7c1fmr17674160qta.6.1698258772445; Wed, 25 Oct 2023 11:32:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHmDTPwWqRC+sjZRhb2to530Nzat2CNqaAJgvR/jHP6RYohnTkO+BdAiiv58B01PrIzPGFsWg== X-Received: by 2002:ac8:57d3:0:b0:41c:c60c:7c1f with SMTP id w19-20020ac857d3000000b0041cc60c7c1fmr17674141qta.6.1698258772119; Wed, 25 Oct 2023 11:32:52 -0700 (PDT) Received: from localhost.localdomain (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id g22-20020ac84dd6000000b004166905aa2asm4386627qtw.28.2023.10.25.11.32.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Oct 2023 11:32:51 -0700 (PDT) From: Patrick Palka To: gcc-patches@gcc.gnu.org Cc: jason@redhat.com, nathan@acm.org, Patrick Palka Subject: [PATCH] c++/modules: fix up recent testcases Date: Wed, 25 Oct 2023 14:32:44 -0400 Message-ID: <20231025183245.837312-1-ppalka@redhat.com> X-Mailer: git-send-email 2.42.0.482.g2e8e77cbac MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-13.6 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_H4,RCVD_IN_MSPIKE_WL,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 List-Id: Tested on x86_64-pc-linux-gnu, does this look OK for trunk? Declaring get() inline seems necessary to avoid link failure: /usr/bin/ld: /tmp/ccwdv6Co.o: in function `g3@pr105322.Decltype()': decltype-1_b.C:(.text._ZW8pr105322W8Decltype2g3v[_ZW8pr105322W8Decltype2g3v]+0x18): undefined reference to `f@pr105322.Decltype()::A::get()' Not sure if that's expected? -- >8 -- This fixes some minor issues with the testcases from r14-4806-g084addf8a700fa. gcc/testsuite/ChangeLog: * g++.dg/modules/decltype-1_a.C: Add missing } to dg-module-do directive. Declare f()::A::get() inline. * g++.dg/modules/lambda-5_a.C: Add missing } to dg-module-do directive. --- gcc/testsuite/g++.dg/modules/decltype-1_a.C | 4 ++-- gcc/testsuite/g++.dg/modules/lambda-5_a.C | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gcc/testsuite/g++.dg/modules/decltype-1_a.C b/gcc/testsuite/g++.dg/modules/decltype-1_a.C index ca66e8b598a..6512f151aae 100644 --- a/gcc/testsuite/g++.dg/modules/decltype-1_a.C +++ b/gcc/testsuite/g++.dg/modules/decltype-1_a.C @@ -1,5 +1,5 @@ // PR c++/105322 -// { dg-module-do link +// { dg-module-do link } // { dg-additional-options -fmodules-ts } // { dg-module-cmi pr105322.Decltype } @@ -7,7 +7,7 @@ export module pr105322.Decltype; auto f() { struct A { int m; - int get () { return m; } + inline int get () { return m; } }; return A{}; } diff --git a/gcc/testsuite/g++.dg/modules/lambda-5_a.C b/gcc/testsuite/g++.dg/modules/lambda-5_a.C index 6b589d4965c..37d0e77b1e1 100644 --- a/gcc/testsuite/g++.dg/modules/lambda-5_a.C +++ b/gcc/testsuite/g++.dg/modules/lambda-5_a.C @@ -1,5 +1,5 @@ // PR c++/105322 -// { dg-module-do link +// { dg-module-do link } // { dg-additional-options -fmodules-ts } // { dg-module-cmi pr105322.Lambda } -- 2.42.0.482.g2e8e77cbac