From patchwork Thu Mar 31 01:43:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 52492 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 CCB68385E44A for ; Thu, 31 Mar 2022 01:43:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CCB68385E44A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1648691035; bh=HcsO0SuoAfog5lJ3b6cxgHcfTBDT/9axRLfvg0EyVlI=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=KTX0U+OUc7ntl1A8xuXWZCxJ0UsJTIPvibjV5/rVPrKlouQCu87N3kiSB+bPqNCSj 0pyLVtqO3PoypwNqW+2XZVClOAytXOgyytGts/on0peg0VbRdpiXCJdCnWmaOwyjEV U5QSd0uphBi3gsFpRVG7JAXHNnO42/CIn0uNpPRs= 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 DB6B93858D37 for ; Thu, 31 Mar 2022 01:43:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org DB6B93858D37 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-311-QqIZ1omxNnC6xHY20XnNpg-1; Wed, 30 Mar 2022 21:43:22 -0400 X-MC-Unique: QqIZ1omxNnC6xHY20XnNpg-1 Received: by mail-qk1-f199.google.com with SMTP id v22-20020a05620a0a9600b0067e87a1ff57so13833026qkg.14 for ; Wed, 30 Mar 2022 18:43:22 -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=HcsO0SuoAfog5lJ3b6cxgHcfTBDT/9axRLfvg0EyVlI=; b=ufW6jluQ9NOfilQ44xy6GgXCYH5UWjiy07sd9atHebtOw6Sq3uKns+7YvC0v4g9eDM iNRszJGqpSbWv++8giPOvGdLjbEi0nJVpLVmt+WhUye/kPOYXPxfb6s2eg3DwpC3GPK0 giH4KiLb52VqABzKo22GSz8df7/Vfzk97izbFe9OjM6BU4+CE1Q4KYbu4NRV3uoqWqCq Xq0P0St2OcJhHi8NpuKSqWABoLkA6OmM3g2IWyEsg9pN5Huhe2slyozuDlntp/wBHZo7 c6RPPdkN80ZhELtzkVLYo+h8WO10pkgxcZRqgnndAQlnKOB9E4onbIGYEILvu5To6Smh FpJg== X-Gm-Message-State: AOAM532ZkiBf4Bv4s1+OKp6uKDuF1xtcW4+8SiGU+HIVhhnwxB4SLAK+ eFyxdv8BAsrHq93PQOJhhFdcBT/6ys5CJ8ZDn5O6f5MuIM3jTKkq3056gajQ7btuDs5ZxcamEQb 6wp3Ml4uXxDE/JbAajtzC50HcRO0P8HuOwT/Z3DbXKLo6mMZxS6Tp7ZJ1Lb1fmD7HXA== X-Received: by 2002:a05:620a:1426:b0:67b:467e:a626 with SMTP id k6-20020a05620a142600b0067b467ea626mr1843250qkj.261.1648691001434; Wed, 30 Mar 2022 18:43:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyQZA/VUr03eJDKYIv9rNJHGjljsDY1NlupPyD5/ZWPkRZW6UqtEhTLtS8oL+91SRlFuG/oew== X-Received: by 2002:a05:620a:1426:b0:67b:467e:a626 with SMTP id k6-20020a05620a142600b0067b467ea626mr1843239qkj.261.1648691001004; Wed, 30 Mar 2022 18:43:21 -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 r8-20020a05622a034800b002e1d615484bsm19193499qtw.37.2022.03.30.18.43.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Mar 2022 18:43:20 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: parse trivial DMI immediately [PR96645] Date: Wed, 30 Mar 2022 21:43:12 -0400 Message-Id: <20220331014312.2080968-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.0 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, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE 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: Jason Merrill via Gcc-patches From: Jason Merrill Reply-To: Jason Merrill Cc: Jonathan Wakely Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" The recent change to reject __is_constructible for nested classes with DMI is breaking some code loudly that was previously only silently broken. Let's allow simple cases by immediately parsing DMI that do no name lookup; then being in complete class scope makes no difference. Tested x86_64-pc-linux-gnu, applying to trunk. PR c++/96645 gcc/cp/ChangeLog: * parser.cc (cp_parser_early_parsing_nsdmi): New. (cp_parser_member_declaration): Call it. gcc/testsuite/ChangeLog: * g++.dg/cpp0x/nsdmi10.C: Now OK. * g++.dg/ext/is_constructible3.C: Likewise. * g++.dg/ext/is_constructible7.C: Likewise. --- gcc/cp/parser.cc | 28 +++++++++++++++++++- gcc/testsuite/g++.dg/cpp0x/nsdmi10.C | 4 +-- gcc/testsuite/g++.dg/ext/is_constructible3.C | 2 +- gcc/testsuite/g++.dg/ext/is_constructible7.C | 3 +-- 4 files changed, 31 insertions(+), 6 deletions(-) base-commit: 150ab50f7449cf5b496bbe6e5c60cb1adb2e2d6c diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc index 7e1c777364e..63c8af1c722 100644 --- a/gcc/cp/parser.cc +++ b/gcc/cp/parser.cc @@ -2701,6 +2701,8 @@ static tree cp_parser_late_parse_one_default_arg (cp_parser *, tree, tree, tree); static void cp_parser_late_parsing_nsdmi (cp_parser *, tree); +static bool cp_parser_early_parsing_nsdmi + (cp_parser *, tree); static void cp_parser_late_parsing_default_args (cp_parser *, tree); static tree cp_parser_sizeof_operand @@ -27478,7 +27480,8 @@ cp_parser_member_declaration (cp_parser* parser) if (DECL_DECLARES_FUNCTION_P (decl)) cp_parser_save_default_args (parser, STRIP_TEMPLATE (decl)); else if (TREE_CODE (decl) == FIELD_DECL - && DECL_INITIAL (decl)) + && DECL_INITIAL (decl) + && !cp_parser_early_parsing_nsdmi (parser, decl)) /* Add DECL to the queue of NSDMI to be parsed later. */ vec_safe_push (unparsed_nsdmis, decl); } @@ -32292,6 +32295,29 @@ cp_parser_late_parsing_nsdmi (cp_parser *parser, tree field) DECL_INITIAL (field) = def; } +/* If the DEFERRED_PARSE for FIELD is safe to parse immediately, do so. + Returns true if deferred parsing is no longer needed. */ + +static bool +cp_parser_early_parsing_nsdmi (cp_parser *parser, tree field) +{ + tree init = DECL_INITIAL (field); + if (TREE_CODE (init) != DEFERRED_PARSE) + return true; + + cp_token_cache *tokens = DEFPARSE_TOKENS (init); + for (cp_token *p = tokens->first; p != tokens->last; ++p) + if (p->type == CPP_NAME + || p->keyword == RID_THIS + || p->keyword == RID_OPERATOR) + /* There's a name to look up or 'this', give up. */ + return false; + + /* It's trivial, parse now. */ + cp_parser_late_parsing_nsdmi (parser, field); + return true; +} + /* FN is a FUNCTION_DECL which may contains a parameter with an unparsed DEFERRED_PARSE. Parse the default args now. This function assumes that the current scope is the scope in which the default diff --git a/gcc/testsuite/g++.dg/cpp0x/nsdmi10.C b/gcc/testsuite/g++.dg/cpp0x/nsdmi10.C index d8588b7f29e..a965f7bc333 100644 --- a/gcc/testsuite/g++.dg/cpp0x/nsdmi10.C +++ b/gcc/testsuite/g++.dg/cpp0x/nsdmi10.C @@ -6,7 +6,7 @@ struct A1 { int y1 = 1; }; - A1(const B1& opts = B1()) {} // { dg-error "default member initializer" } + A1(const B1& opts = B1()) {} }; struct A2 { @@ -14,5 +14,5 @@ struct A2 { int x2, y2 = 1; }; - A2(const B2& opts = B2()) {} // { dg-error "default member initializer" } + A2(const B2& opts = B2()) {} }; diff --git a/gcc/testsuite/g++.dg/ext/is_constructible3.C b/gcc/testsuite/g++.dg/ext/is_constructible3.C index 305751d28e2..c7c58746cd0 100644 --- a/gcc/testsuite/g++.dg/ext/is_constructible3.C +++ b/gcc/testsuite/g++.dg/ext/is_constructible3.C @@ -8,7 +8,7 @@ struct A { B() = default; }; - static constexpr bool v = __is_constructible (B); // { dg-error "member initializer" } + static constexpr bool v = __is_constructible (B); }; diff --git a/gcc/testsuite/g++.dg/ext/is_constructible7.C b/gcc/testsuite/g++.dg/ext/is_constructible7.C index 76a63bba5d0..013a1df03c6 100644 --- a/gcc/testsuite/g++.dg/ext/is_constructible7.C +++ b/gcc/testsuite/g++.dg/ext/is_constructible7.C @@ -12,7 +12,7 @@ using true_type = bool_constant; template struct is_default_constructible - : bool_constant<__is_constructible(T)> // { dg-error "default member init" } + : bool_constant<__is_constructible(T)> { }; void testVarStruct() @@ -22,7 +22,6 @@ void testVarStruct() int number = 5; // compiles, if remove initialization }; - // { dg-prune-output "could not convert" } is_default_constructible::type t = true_type{}; }; }