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.133.124]) by sourceware.org (Postfix) with ESMTPS id C032E3858D33 for ; Wed, 25 Oct 2023 21:24:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C032E3858D33 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 C032E3858D33 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698269082; cv=none; b=OxeTGPFv6owAO/bDKa4JCC3GINEI+Y1dH/uXcxTwg9gSQ6KcE6wZldlQOQPq4mkevFeKmwTxyLaaLvZuwFfB4nVX0xjvpS1WnjC4ZDxg54verX1ghzDoEYOy2SvlET89SwSkU3/uZDa/4PkHf09KfcWGy1+iil/7KLTj617jotQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698269082; c=relaxed/simple; bh=/f8h5wgatF8yO2JEYDwbGxspPmdzxQ3mQtZoH/fb36s=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:To:From; b=oYtdtdqKzAZzz7Nf32NE55y2EoR0pZspi3Zg+L7cH/BT7YwQb3YCG9mpcN2EemdOtRibe8NdYnZgEBpX/uk5ylowUwVPF44nA+lOMLalcKKKvpEo/hsNudqWfwuJrdTQGmqlaiudvSi4Fyx9z1MrFWu3pSDeHBPxA4xwYmGIWEk= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698269081; 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=QP86zF0LHl5hnkMPsJoy3ysR6L84MMS96LzoNimg5Z4=; b=apCxsbV005EJ83wVHPvuirbDV7z0M16k5ElIOygdUQyttWYbHdACBSrkM0UYF//Z038f7C iLroLBEufw47hGelvDeSIl5TkKzMj2nNJ4r5JWX3+aVnqQJ/6SkaFQaK0JIjaJYXAYLLAb wDL75PeiKW4erzKtX8/oswLDYDRmQtw= Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-328-wkwv0c-eP5yyDPIfUtvZZA-1; Wed, 25 Oct 2023 17:24:40 -0400 X-MC-Unique: wkwv0c-eP5yyDPIfUtvZZA-1 Received: by mail-qt1-f198.google.com with SMTP id d75a77b69052e-41cbb2970f4so3390401cf.2 for ; Wed, 25 Oct 2023 14:24:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698269079; x=1698873879; 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=QP86zF0LHl5hnkMPsJoy3ysR6L84MMS96LzoNimg5Z4=; b=w/e+5o6WtK0JYLnAKNeJUabu/9cucPJCgMeuLr6Za+QsWWr9DNq92/uNHEEyzF7Bx5 r+hwqDdCt1u2wxh+AIsaRxJrSSCGenemwCtNfvMpuQ6MBFBFIVd7xdnkxI6yjRsL1guE VMgnV49bqSsKeBMP/pLTbNV8gzlDUuuG98AmpCgfEx5fHumS6HUdm4jAX8mRh6m9wDjB OuoniQCoPSWWI72zpULLuLw1NyiqJYKzxyI2rYDdH2oXf8+NxrFcejO9P6fOesuHIcYa JivXMQ6PeNf4txnB48fU3i1dB6CpPD+lB/QJxrEZDYzcpEP/oWuUwuMVzHYlTXdOWiWf IPuw== X-Gm-Message-State: AOJu0YwLKOVHHctfC7Sb3lawFp2XsimLLC8HjuJI32JB3/eRZl4R8Jeh JHIZ8ExUQMCEMfnJXjRd/DoceZnjMh8vflLIC6UkbnhGjRkYCdRg5edvO+/zY58j6p3qMsdOiLo AH9A+pZ0LWDbtrvhDhQ== X-Received: by 2002:a05:622a:174b:b0:419:6391:6c07 with SMTP id l11-20020a05622a174b00b0041963916c07mr18862674qtk.28.1698269079425; Wed, 25 Oct 2023 14:24:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG0ZIgzEavHBWlhkL72eJUoO3oF6O6Me+3Z/iDG8oEI5ZYu9jn8K++i2BmygyQ7KrABE5pf6A== X-Received: by 2002:a05:622a:174b:b0:419:6391:6c07 with SMTP id l11-20020a05622a174b00b0041963916c07mr18862661qtk.28.1698269079117; Wed, 25 Oct 2023 14:24:39 -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 g3-20020ac81243000000b00417b9f5b883sm4530073qtj.2.2023.10.25.14.24.38 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 25 Oct 2023 14:24:38 -0700 (PDT) Message-ID: <445fbb1a-3ff6-4e86-8549-030be0b79228@redhat.com> Date: Wed, 25 Oct 2023 17:24:37 -0400 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] c++/modules: fix up recent testcases To: Patrick Palka , gcc-patches@gcc.gnu.org Cc: nathan@acm.org References: <20231025183245.837312-1-ppalka@redhat.com> From: Jason Merrill In-Reply-To: <20231025183245.837312-1-ppalka@redhat.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.4 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_H3,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: On 10/25/23 14:32, Patrick Palka wrote: > 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? That seems like a bug. My guess is that the bug is treating f()::A::get as internal linkage, but Nathan should have a better understanding of how it's supposed to work. > -- >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 } >