From patchwork Mon Jan 23 19:09:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 63595 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 B8CBE3858425 for ; Mon, 23 Jan 2023 19:10:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B8CBE3858425 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1674501012; bh=sw50UKDCpBQyb2DW5VluTPzEJNOUCdkkkUZgXr5QFFc=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=TIxM+4HIMR7pH9gCJ9MJ+uof4pXwiNxf2tcTlAbEsRzRZxaV2B/vV0hKN5pEZ9C1c nE6H03hQrPKWJrxpQ41NbMCOXrCh/JSQfKpnp81JGpbuOZqAn01h0+UNkZFrR29xDq XhT+aUo1d2eYgrkMksyEnAKIdQzTUvjYtVF3ecqc= 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.133.124]) by sourceware.org (Postfix) with ESMTPS id 1DE6C3858D33 for ; Mon, 23 Jan 2023 19:09:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1DE6C3858D33 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_128_GCM_SHA256) id us-mta-630-dWLQo74tNuqFCMYKBWDdoA-1; Mon, 23 Jan 2023 14:09:41 -0500 X-MC-Unique: dWLQo74tNuqFCMYKBWDdoA-1 Received: by mail-qt1-f200.google.com with SMTP id hf20-20020a05622a609400b003abcad051d2so4886920qtb.12 for ; Mon, 23 Jan 2023 11:09:41 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=sw50UKDCpBQyb2DW5VluTPzEJNOUCdkkkUZgXr5QFFc=; b=MAG5Hq2H4MyTv+ZjA6Xg5btI9e0ed0cH7Xo11xbgON2DMwrXQpfluCJSyiOPq8Y6nn +N9AmWempQq/77oOorfFi40MM10/WYFGzjdptgyXVDsg4w+aIohUE14MS7rnHjUcvNDl RE5WzLNjnwURdSYPlzUCOdmHXlkxXZVpeboS0uB+vhbBsHrSAd1fYhx/Tkw9GkbYXZYs 3t2DUDYGnw7bidmgFEk21gMk7ZK7fmZ4YishxwjPJpjWGK+8mrsSOj2TupgLkoMUoSPD QcloWxGtZZrSRTYmHzvgfUU2KvLrfTnJnLHP9J56GLdQdkPpKqh0IvCOFsLPYz5NAm9H g0KA== X-Gm-Message-State: AFqh2kqDlg/ejjwHsfGPrIQh13Y41Jcnd1TUqVsdiVHyDSYKszNXp+l5 sRSAwOwC0uG3KEKnkYQeBLCC2libq7Uwg5pqK3S9itOGncEqWWaxsIQIHsWoU58U3rHFdheOYvZ 8FMqNPIa4GvEd9c1SJ+MZSuyWSzSpOiB0Xq8LWMYyWTUQL0NDS/wb5oYCBNmoAAh2RA== X-Received: by 2002:a05:622a:1f16:b0:3a6:a4ed:7c42 with SMTP id ca22-20020a05622a1f1600b003a6a4ed7c42mr39885988qtb.54.1674500980684; Mon, 23 Jan 2023 11:09:40 -0800 (PST) X-Google-Smtp-Source: AMrXdXvFJqiCto48DkDoA9fyfRD/As3hOCrk73Q3vlLm5GGtumCetRTp8mdWLfd4zW8YQwAxkHgjnw== X-Received: by 2002:a05:622a:1f16:b0:3a6:a4ed:7c42 with SMTP id ca22-20020a05622a1f1600b003a6a4ed7c42mr39885954qtb.54.1674500980264; Mon, 23 Jan 2023 11:09:40 -0800 (PST) Received: from jason.com (130-44-159-43.s15913.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.159.43]) by smtp.gmail.com with ESMTPSA id bw5-20020a05622a098500b003b64f1b1f40sm8837699qtb.40.2023.01.23.11.09.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jan 2023 11:09:39 -0800 (PST) To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: result location and explicit inst [PR108496] Date: Mon, 23 Jan 2023 14:09:36 -0500 Message-Id: <20230123190936.4161568-1-jason@redhat.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.5 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jason Merrill via Gcc-patches From: Jason Merrill Reply-To: Jason Merrill Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Tested x86_64-pc-linux-gnu, applying to trunk. -- 8< -- In r13-4469 we started to build the RESULT_DECL in grokdeclarator, while we still know the location of the return type. But in this testcase, we hit that code again when parsing the explicit instantiation, and clobber the DECL_RESULT that was previously used in parsing the function. So, only set DECL_RESULT if it isn't already set. PR c++/108496 gcc/cp/ChangeLog: * decl.cc (grokdeclarator): Check whether DECL_RESULT is already set. gcc/testsuite/ChangeLog: * g++.dg/template/explicit-instantiation5.C: New test. --- gcc/cp/decl.cc | 6 +++++- .../g++.dg/template/explicit-instantiation5.C | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/template/explicit-instantiation5.C base-commit: 208c6678c25bd9a11e6c5911a4c123cb6b7f3d6e diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc index 75ddf8016b5..d606b31d7a7 100644 --- a/gcc/cp/decl.cc +++ b/gcc/cp/decl.cc @@ -14776,7 +14776,9 @@ grokdeclarator (const cp_declarator *declarator, { /* If we saw a return type, record its location. */ location_t loc = declspecs->locations[ds_type_spec]; - if (loc != UNKNOWN_LOCATION) + if (loc == UNKNOWN_LOCATION) + /* Build DECL_RESULT in start_preparsed_function. */; + else if (!DECL_RESULT (decl)) { tree restype = TREE_TYPE (TREE_TYPE (decl)); tree resdecl = build_decl (loc, RESULT_DECL, 0, restype); @@ -14784,6 +14786,8 @@ grokdeclarator (const cp_declarator *declarator, DECL_IGNORED_P (resdecl) = 1; DECL_RESULT (decl) = resdecl; } + else if (funcdef_flag) + DECL_SOURCE_LOCATION (DECL_RESULT (decl)) = loc; } /* Record constancy and volatility on the DECL itself . There's diff --git a/gcc/testsuite/g++.dg/template/explicit-instantiation5.C b/gcc/testsuite/g++.dg/template/explicit-instantiation5.C new file mode 100644 index 00000000000..7bc007c8107 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/explicit-instantiation5.C @@ -0,0 +1,15 @@ +// PR c++/108496 + +struct S { long a, b, c; } s; + +template +S foo (S); + +template <> +S +foo <0, long> (S) +{ + return s; +} + +template S foo <0, long> (S);