From patchwork Sun May 15 16:43:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 53992 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 B98023858010 for ; Sun, 15 May 2022 16:44:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B98023858010 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1652633040; bh=gC7VNXvQMXz2l1KaWZX+RnCPil82OlnjImxQG2+baQU=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=yXNN2prxQdGUKD8hE7xbY8V6ZQ8LfuX5+9T7k+BcfuPE73egk+da7KOUjYR5/9L+e nABETzxz9kjSfHYPJBDKQouUH/NkGXKR1D57JeS+Tf+F1BblGmdv7H6GB2US4pCRq4 6EnylteN9YYwhYupNcfkDxHnApMMp0m/eOhdABLw= 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 DC64F3858D32 for ; Sun, 15 May 2022 16:43:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org DC64F3858D32 Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-501-gWTgzYwBOqiyQeDqDkuC8w-1; Sun, 15 May 2022 12:43:29 -0400 X-MC-Unique: gWTgzYwBOqiyQeDqDkuC8w-1 Received: by mail-qv1-f70.google.com with SMTP id bu6-20020ad455e6000000b004563a74e3f9so10522815qvb.9 for ; Sun, 15 May 2022 09:43:29 -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:subject:date:message-id:mime-version :content-transfer-encoding; bh=gC7VNXvQMXz2l1KaWZX+RnCPil82OlnjImxQG2+baQU=; b=HiIGZrMT3o/Q4L16Kvv7ltvOMjX4PXqXfPjWA+bFyVFjESdTYue/Onvy7c7nNlHaQf muvtEJii/rmeII0qG/X+xvUXAus+CwWNYDbMN2iW6SPYuWrcS/W1o97IEAW9mhiD3kyf lxvGQcsXDxIQXvb0PMB15xooGluk8zlsx6m5s+jDDys/gJwdimS/z6sl/PJkwY4pFLBh wrz/1O5+L0D481LgkE/maad/cHbxSlqy5pCwm2t0qVr0vNDcLury/wMJcpXR1K5+VSNW nwHaKQeSlQkT/vPUPNOhzM6Eh4Bw34o0ZGdpHKTaXJpTyxn+aFy+wikqlK0ouDN59BBF iJlw== X-Gm-Message-State: AOAM5321RCmIGTJ/slQSr6oqQuG6mbUWzu33eztQegDMvTFJiiB2/jMN Xy15/zZON1OrSbEOp5z1ANqaAd7m9CmLXircfpiN9UtAI1RoMiMLHIyXFHhUPywXxPaU2XLcemy c6vyehiIKmwV6alnpYM+QNYXe9e3WG2pHm9tmjSW3n++hiNOrOVKFp2r/pD+bDHspZA== X-Received: by 2002:a05:620a:90d:b0:6a0:fab:dde8 with SMTP id v13-20020a05620a090d00b006a00fabdde8mr9993949qkv.330.1652633008954; Sun, 15 May 2022 09:43:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxcarrmWl6kUMi/b365hL+KlDNCayN3EdzNA+dW8Nrl10mMadfKxjsq3/xXkbDDTbgXDEkutQ== X-Received: by 2002:a05:620a:90d:b0:6a0:fab:dde8 with SMTP id v13-20020a05620a090d00b006a00fabdde8mr9993928qkv.330.1652633008521; Sun, 15 May 2022 09:43:28 -0700 (PDT) Received: from barrymore.redhat.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 q19-20020ac87353000000b002f39b99f67esm4650845qtp.24.2022.05.15.09.43.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 May 2022 09:43:27 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: parsing injected-class-name as template Date: Sun, 15 May 2022 12:43:26 -0400 Message-Id: <20220515164326.3971647-1-jason@redhat.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-13.3 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, T_SCC_BODY_TEXT_LINE 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" While I was backporting the patch for PR102300, it occurred to me that it would be cleaner to look through the injected-class-name earlier in the function. I don't think this changes any test results. Tested x86_64-pc-linux-gnu, applying to trunk. gcc/cp/ChangeLog: * parser.cc (cp_parser_template_name): Look through injected-class-name. --- gcc/cp/parser.cc | 3 +++ 1 file changed, 3 insertions(+) base-commit: ce46d6041358052dfa26f3720732f0357c5d72e7 diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc index 8969ed0076a..d4dab6cf84e 100644 --- a/gcc/cp/parser.cc +++ b/gcc/cp/parser.cc @@ -18646,6 +18646,9 @@ cp_parser_template_name (cp_parser* parser, (9.3.4), or in a type-only context other than a nested-name-specifier (13.8). */ + /* Handle injected-class-name. */ + decl = maybe_get_template_decl_from_type_decl (decl); + /* If DECL is a template, then the name was a template-name. */ if (TREE_CODE (decl) == TEMPLATE_DECL) {