From patchwork Tue Apr 26 13:45:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 1622419 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=tbJQs15S; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KnjpL4Hdbz9s3q for ; Tue, 26 Apr 2022 23:46:17 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 20A1F385780C for ; Tue, 26 Apr 2022 13:46:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 20A1F385780C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1650980774; bh=xyuEg+8usrGXkm19r1E6nIABylQeP3R1zFPA6KfKtVU=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=tbJQs15SNgHn7uLX+aFqN3YGJNnlWFOxkGs6c7H8uxuMq7oLycCbMQSGeLNfxvDNd sSg0ytgdLDRYNdJuSRFZtdCgyoYUis74l5+c+znYRX2QT0vCQ6ZO2sjzeL2mqmUWI2 NXwIPjlHTgqVYBebt4PciDvw/4rO+FFHm18viCFA= 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 ESMTPS id DC09F3858C83 for ; Tue, 26 Apr 2022 13:45:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org DC09F3858C83 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.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-463-wgaNkN6jNVObfzSo9wRa2A-1; Tue, 26 Apr 2022 09:45:53 -0400 X-MC-Unique: wgaNkN6jNVObfzSo9wRa2A-1 Received: by mail-qk1-f199.google.com with SMTP id e66-20020a378245000000b0069f23a82b5bso6772824qkd.22 for ; Tue, 26 Apr 2022 06:45:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=xyuEg+8usrGXkm19r1E6nIABylQeP3R1zFPA6KfKtVU=; b=Z09jMFmdVnMD/H3Pyp/bwZQuy83DJXZA1WXxBO9YQU81NQWD30HxfQCgCK3xIBLoZ5 Eo9q+1Tz3ZEY1kl5urTE3OP91F3ZA5JvmFmPZWZ7lsovLvdXFCL3YmpFPLSOFV3NIouV MUzUI+lHOyWRGhtFmVeHhoNKZRfkqo/D86fMnqTQ8X9IR6Wtcpygf+MzjSlfadZbGdrR rS/6nNfkwGqk/Fm9mzSjp/L0u+1feF/Ghvc/3bWLMh7xv7Vy4nD3yZkNEK/acp0tCwYY ToSEJFAn9kvW1u0yyapBPlifxMLRj6BIlfg0m3nuqpfMMo/fDFq4ks24n58obbwyygmy qLgw== X-Gm-Message-State: AOAM532pha9/vBaxnbO1uZybgbmm+r/wXnEPjwmmDkng9ULV/byr5JCL h/hgPPuS4gnFNom+lPOv81yFlZ3xtC1jOi9FVSWflKA1/cGsouZa56QX7f6L8RbmjmVRxJPxsaq F5yAVEdLHXPH9UkohntPQmW4qFBH3MG5iyLJV76Ls3Mom+M13CvpzCR5WoGsF9GXaZk0= X-Received: by 2002:a05:620a:1654:b0:69c:7035:b31f with SMTP id c20-20020a05620a165400b0069c7035b31fmr13129894qko.546.1650980752338; Tue, 26 Apr 2022 06:45:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyg3ENBL3YatIB217nMsNABaX2PX06piAvgYOwU/X+yffTJLXyOvDOYJHZJf7cpO1EqX+CvXg== X-Received: by 2002:a05:620a:1654:b0:69c:7035:b31f with SMTP id c20-20020a05620a165400b0069c7035b31fmr13129882qko.546.1650980752047; Tue, 26 Apr 2022 06:45:52 -0700 (PDT) Received: from localhost.localdomain (ool-18e40894.dyn.optonline.net. [24.228.8.148]) by smtp.gmail.com with ESMTPSA id h75-20020a379e4e000000b0069db8210ffbsm6535732qke.12.2022.04.26.06.45.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Apr 2022 06:45:51 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [PATCH] c++: decltype of non-dependent call of class type [PR105386] Date: Tue, 26 Apr 2022 09:45:49 -0400 Message-Id: <20220426134549.970503-1-ppalka@redhat.com> X-Mailer: git-send-email 2.36.0.rc2.10.g1ac7422e39 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-14.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_LOW, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: Patrick Palka via Gcc-patches From: Patrick Palka Reply-To: Patrick Palka Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" We need to pass tf_decltype when instantiating a non-dependent decltype operand, like tsubst does in the dependent case, so that we avoid materializing a temporary for a prvalue operand. Bootstrapped and regtested on x86_64-pc-linux-gnu, does this look OK for trunk/11? PR c++/105386 gcc/cp/ChangeLog: * semantics.cc (finish_decltype_type): Pass tf_decltype to instantiate_non_dependent_expr_sfinae. gcc/testsuite/ChangeLog: * g++.dg/cpp0x/decltype81.C: New test. --- gcc/cp/semantics.cc | 2 +- gcc/testsuite/g++.dg/cpp0x/decltype81.C | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/decltype81.C diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc index f08c0b6281f..ab48f11c9be 100644 --- a/gcc/cp/semantics.cc +++ b/gcc/cp/semantics.cc @@ -11252,7 +11252,7 @@ finish_decltype_type (tree expr, bool id_expression_or_member_access_p, } else if (processing_template_decl) { - expr = instantiate_non_dependent_expr_sfinae (expr, complain); + expr = instantiate_non_dependent_expr_sfinae (expr, complain|tf_decltype); if (expr == error_mark_node) return error_mark_node; /* Keep processing_template_decl cleared for the rest of the function diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype81.C b/gcc/testsuite/g++.dg/cpp0x/decltype81.C new file mode 100644 index 00000000000..7d25db39d9c --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/decltype81.C @@ -0,0 +1,15 @@ +// PR c++/105386 +// { dg-do compile { target c++11 } } + +template struct NoInst { + static_assert(sizeof(T) == 9999, "NoInst instantiated"); +}; + +template NoInst f(T); + +template +struct A { + using type = decltype(f(0)); +}; + +A a;