From patchwork Tue Mar 15 17:18:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 51984 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 0DFCB3858433 for ; Tue, 15 Mar 2022 17:19:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0DFCB3858433 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1647364758; bh=FPCp78+NeSN1c/fheh/vqK6m45UuVtpkDp5TMqpQxMo=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=nxmep2rLKjiejyw9zpeKHb/bRcCg80xUxkayvyrnkt0pnUjZ5xGURdB3APdTMQoKk ObGv++4g2Rmq2DMQgZ5rQoRvrt4iusvI6KtVhWCoDwge3jNkYRHiOSNYD7BgUPmJVL WtmfQlajdkNv8DlP0wsb4SD1v7PnUWaPk3cnlRMs= 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 98E9D3858D20 for ; Tue, 15 Mar 2022 17:18:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 98E9D3858D20 Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-518-AsEnWKGEMX2Q592TueTlmQ-1; Tue, 15 Mar 2022 13:18:46 -0400 X-MC-Unique: AsEnWKGEMX2Q592TueTlmQ-1 Received: by mail-qk1-f197.google.com with SMTP id c19-20020a05620a0cf300b005f17891c015so14819799qkj.18 for ; Tue, 15 Mar 2022 10:18:46 -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=FPCp78+NeSN1c/fheh/vqK6m45UuVtpkDp5TMqpQxMo=; b=PKoueaTLsLx71uebHFze7//ibnHXgqDLmivbdGU5U0ruQoy7LN5RsaONOG9wvRwQb1 QpxhYj3LPZ4N102KelohGgh2ietWIsNI8ABWgI+UxsfdH5XxaxvFdjt0cIr6hwnbkZbA 26JHiRvmoUGfxAJdb1vZBnpj2Toqy1JmoifegPGO12Iw5dlNqqExNc6NmsDW3KitVN0K NJOLbHSK6nZYQLeuklPCUX39/A+R6RBaY6eeplqhuHJ50cLtkP862v1rghlhSqV+M9vU sh4mCNlobvmYGooylndMyR0ibvvmun/kumgMszIHf6sr1yAJHPW+9t9oJo8eKhN7DVaX 7MRA== X-Gm-Message-State: AOAM531xnkpL+H3VjAq7NfeMKDfow8dVsXh0wVPaqUBqdNIwQjMHUvd/ edGO3awi50JYftu0OAidGUptLgYVDmYV02sbXa54fFz4eIjLUWBjLyxG1zPxL4mnvvG6jXrnGNA ZTN9+y3mKf6Fw1Wr/Qw7lTWRmRtWytxt6VVHVAz2ryX0yope4iuyGMzL8Zt9KH5qeBsM= X-Received: by 2002:ac8:5f88:0:b0:2e1:dcda:98cb with SMTP id j8-20020ac85f88000000b002e1dcda98cbmr5317212qta.497.1647364725309; Tue, 15 Mar 2022 10:18:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyYNMt3GQilH+3lyARBG6t14VXEvUtHilqvTFQvB2x+tCQ59QEBnwBLaSFBkkMZHJDl6zd2XA== X-Received: by 2002:ac8:5f88:0:b0:2e1:dcda:98cb with SMTP id j8-20020ac85f88000000b002e1dcda98cbmr5317193qta.497.1647364724994; Tue, 15 Mar 2022 10:18:44 -0700 (PDT) Received: from localhost.localdomain (ool-18e40894.dyn.optonline.net. [24.228.8.148]) by smtp.gmail.com with ESMTPSA id i66-20020a378645000000b0067b31beb87esm9605975qkd.73.2022.03.15.10.18.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Mar 2022 10:18:43 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [PATCH] c++: further lookup_member simplification Date: Tue, 15 Mar 2022 13:18:39 -0400 Message-Id: <20220315171839.1872125-1-ppalka@redhat.com> X-Mailer: git-send-email 2.35.1.500.gb896f729e2 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-14.7 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_H5, 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: Patrick Palka via Gcc-patches From: Patrick Palka Reply-To: Patrick Palka Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" As a followup to r12-7656-gffe9c0a0d3564a, this minor patch condenses the handling of ambiguity and access w.r.t. the value of 'protect' so that it more clearly matches the function comment. Bootstrapped and regtested on x86_64-pc-linux-gnu, does this look OK for trunk? gcc/cp/ChangeLog: * search.cc (lookup_member): Simplify by handling all values of protect at once in case of ambiguous lookup. Don't modify protect. --- gcc/cp/search.cc | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/gcc/cp/search.cc b/gcc/cp/search.cc index 85e3e7cb487..b86b3a24080 100644 --- a/gcc/cp/search.cc +++ b/gcc/cp/search.cc @@ -1168,27 +1168,21 @@ lookup_member (tree xbasetype, tree name, int protect, bool want_type, if (rval_binfo) type = BINFO_TYPE (rval_binfo); - /* If we are not interested in ambiguities, don't report them; - just return NULL_TREE. */ - if (!protect && lfi.ambiguous) - return NULL_TREE; - - if (protect == 2) - { - if (lfi.ambiguous) - return lfi.ambiguous; - else - protect = 0; - } - - if (protect == 1 && lfi.ambiguous) + if (lfi.ambiguous) { - if (complain & tf_error) + if (protect == 0) + return NULL_TREE; + else if (protect == 1) { - error ("request for member %qD is ambiguous", name); - print_candidates (lfi.ambiguous); + if (complain & tf_error) + { + error ("request for member %qD is ambiguous", name); + print_candidates (lfi.ambiguous); + } + return error_mark_node; } - return error_mark_node; + else if (protect == 2) + return lfi.ambiguous; } if (!rval) @@ -1213,7 +1207,7 @@ lookup_member (tree xbasetype, tree name, int protect, bool want_type, only the first call to "f" is valid. However, if the function is static, we can check. */ - if (protect && !really_overloaded_fn (rval)) + if (protect == 1 && !really_overloaded_fn (rval)) { tree decl = is_overloaded_fn (rval) ? get_first_fn (rval) : rval; decl = strip_using_decl (decl);