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.129.124]) by sourceware.org (Postfix) with ESMTPS id AC6E83858403 for ; Fri, 10 Dec 2021 15:55:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org AC6E83858403 Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-131-pHVYtbwUNWCmcY1nLZdiTg-1; Fri, 10 Dec 2021 10:55:24 -0500 X-MC-Unique: pHVYtbwUNWCmcY1nLZdiTg-1 Received: by mail-ed1-f69.google.com with SMTP id w5-20020a05640234c500b003f1b9ab06d2so8588330edc.13 for ; Fri, 10 Dec 2021 07:55:24 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=Ol5rglOvBaiMMhDcIE/TojMk4TgJ/qXtf8QuddLgCHE=; b=sbrGXIbC+P0f5XqBArPsc3Ay3kc8YXPyah9m35pcNNeQadernTYvWmgczR6ERCMUEk PrqVnrs00GeCFfe6j4k6Jda7HLE0JGKbGiF3FMrZpFDDuR0C8wGyKsaavNranVlWaVGJ fbCPQJcTHjSxj4z0EHvYAZTGh61+We2h9ZeQtYWhgMdU0Vmta3CEjXpiAZaEzOd066bV 7+i2Jkkdq48Jkq1/PzQ6cgvoRkVSSFKoj9mQD0OH8vFsVgkN9JkM/MswTkOZWYg/BZ3P lMpQVXINASXQ3MrjVfpzLMdPaDZYWZMhtOOHIb7brPtt3pejcN9nW1ss7j59/4Vr9vCH M2Gg== X-Gm-Message-State: AOAM533bi9whX4TujirEQuoTcytITVecV4tzFKY4FswZw19Z7GKipf9/ DEoFgEqVAkgf6aPUmGmvU73mokWMV5n9n4HdLLr36lxkAhVm1t+4cV2BKjxOe8f4ZU6NkY8O+la 2HW6ejO9LcOk49KAPh8jzHN9eno/Y6W2Mpw== X-Received: by 2002:a17:907:1b17:: with SMTP id mp23mr23832716ejc.521.1639151721361; Fri, 10 Dec 2021 07:55:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJxcIlA8fbszOlARokvy4QGLHLH9weqYfUqHiYGE4MefK2EZF2mA+U+gFoETavM2nULHj7Hwmt8d1z0QFIuEfUM= X-Received: by 2002:a17:907:1b17:: with SMTP id mp23mr23832690ejc.521.1639151721032; Fri, 10 Dec 2021 07:55:21 -0800 (PST) MIME-Version: 1.0 References: <20211210154800.2903317-1-ppalka@redhat.com> In-Reply-To: <20211210154800.2903317-1-ppalka@redhat.com> From: Patrick Palka Date: Fri, 10 Dec 2021 10:55:09 -0500 Message-ID: Subject: Re: [PATCH] c++: remove COMPOUND_EXPR_OVERLOADED flag To: GCC Patches X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" 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, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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-List-Received-Date: Fri, 10 Dec 2021 15:55:27 -0000 On Fri, Dec 10, 2021 at 10:48 AM Patrick Palka wrote: > > This flag is never set because non-dependent COMPOUND_EXPRs are fully Whoops, this should say, ... non-dependent COMPOUND_EXPRs that resolve to an overload are expressed as a CALL_EXPR at template definition time ... > resolved into a CALL_EXPR at template definition time (in > build_x_compound_expr) ever since r6-5772. > > Bootstrapped and regtested on x86_64-pc-linux-gnu, does this look OK for > trunk? > > gcc/cp/ChangeLog: > > * cp-tree.h (COMPOUND_EXPR_OVERLOADED): Remove. > * pt.c (build_non_dependent_expr): Don't inspect this flag. > * tree.c (build_min_non_dep): Don't set this flag. > --- > gcc/cp/cp-tree.h | 6 ------ > gcc/cp/pt.c | 3 +-- > gcc/cp/tree.c | 5 ----- > 3 files changed, 1 insertion(+), 13 deletions(-) > > diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h > index b1c3bc5ed1f..e4330fb1f8b 100644 > --- a/gcc/cp/cp-tree.h > +++ b/gcc/cp/cp-tree.h > @@ -404,7 +404,6 @@ extern GTY(()) tree cp_global_trees[CPTI_MAX]; > NEW_EXPR_USE_GLOBAL (in NEW_EXPR). > COND_EXPR_IS_VEC_DELETE (in COND_EXPR). > DELETE_EXPR_USE_GLOBAL (in DELETE_EXPR). > - COMPOUND_EXPR_OVERLOADED (in COMPOUND_EXPR). > CLEANUP_P (in TRY_BLOCK) > AGGR_INIT_VIA_CTOR_P (in AGGR_INIT_EXPR) > PTRMEM_OK_P (in ADDR_EXPR, OFFSET_REF, SCOPE_REF) > @@ -4015,11 +4014,6 @@ struct GTY(()) lang_decl { > #define CALL_OR_AGGR_INIT_CHECK(NODE) \ > TREE_CHECK2 ((NODE), CALL_EXPR, AGGR_INIT_EXPR) > > -/* Indicates that this is a non-dependent COMPOUND_EXPR which will > - resolve to a function call. */ > -#define COMPOUND_EXPR_OVERLOADED(NODE) \ > - TREE_LANG_FLAG_0 (COMPOUND_EXPR_CHECK (NODE)) > - > /* In a CALL_EXPR appearing in a template, true if Koenig lookup > should be performed at instantiation time. */ > #define KOENIG_LOOKUP_P(NODE) TREE_LANG_FLAG_0 (CALL_EXPR_CHECK (NODE)) > diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c > index 9834baf34db..cbdb4b566aa 100644 > --- a/gcc/cp/pt.c > +++ b/gcc/cp/pt.c > @@ -28373,8 +28373,7 @@ build_non_dependent_expr (tree expr) > ? build_non_dependent_expr (TREE_OPERAND (expr, 1)) > : build_non_dependent_expr (TREE_OPERAND (expr, 0))), > build_non_dependent_expr (TREE_OPERAND (expr, 2))); > - if (TREE_CODE (expr) == COMPOUND_EXPR > - && !COMPOUND_EXPR_OVERLOADED (expr)) > + if (TREE_CODE (expr) == COMPOUND_EXPR) > return build2 (COMPOUND_EXPR, > TREE_TYPE (expr), > TREE_OPERAND (expr, 0), > diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c > index 52c56831f98..f6f7927f293 100644 > --- a/gcc/cp/tree.c > +++ b/gcc/cp/tree.c > @@ -3577,11 +3577,6 @@ build_min_non_dep (enum tree_code code, tree non_dep, ...) > for (i = 0; i < length; i++) > TREE_OPERAND (t, i) = va_arg (p, tree); > > - if (code == COMPOUND_EXPR && TREE_CODE (non_dep) != COMPOUND_EXPR) > - /* This should not be considered a COMPOUND_EXPR, because it > - resolves to an overload. */ > - COMPOUND_EXPR_OVERLOADED (t) = 1; > - > va_end (p); > return convert_from_reference (t); > } > -- > 2.34.1.75.gabe6bb3905 >