From patchwork Tue Aug 18 13:05:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Sidwell X-Patchwork-Id: 1346822 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=acm.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=iBHvqDPq; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BWB3j6c8pz9sPC for ; Tue, 18 Aug 2020 23:05:37 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8B575386197A; Tue, 18 Aug 2020 13:05:31 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-qv1-xf32.google.com (mail-qv1-xf32.google.com [IPv6:2607:f8b0:4864:20::f32]) by sourceware.org (Postfix) with ESMTPS id 9BF173857C4D for ; Tue, 18 Aug 2020 13:05:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 9BF173857C4D Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=acm.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=nathanmsidwell@gmail.com Received: by mail-qv1-xf32.google.com with SMTP id x7so9457831qvi.5 for ; Tue, 18 Aug 2020 06:05:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=Mpp3AGTo7k69NhkjKii7ZeVfdoh3E96jYvOw7gMORlA=; b=iBHvqDPqVEsfpGvvJpZc7w392zpG48AKfQnc87wppg7JZGl5szHFp1YvbiXDGgfYMK vutL7XkNwMn/TKEc6AJRetrOY9ZiF7nVwT3YukBWctf7nfUgzwFOnzD8VAvPdI4zUWQO QQa6xnbyC6jhWGxIKfIkw7IbwZ8zDtEi8IGFK8f8/tWGXWzCVGaJn/HOEin09eOb+fJ0 p+CXKGFfE029Q7Kw+djC+mk2YVHKZOnXIX/SLwDJ9gmW8XkRCfl9qSO5LVG0NV+42VjR YRu3W0E5FhOZ6CSX4oByJ3vlzewz/enU0pGMIAjIRtvGESgIboxBTmpfbgNWPC6ibQm8 noNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:to:from:subject:message-id:date :user-agent:mime-version:content-language; bh=Mpp3AGTo7k69NhkjKii7ZeVfdoh3E96jYvOw7gMORlA=; b=eFhkMW/QC5VZRpUIiE4+ZVvNlXSuMtl03FdvlXt1/KWDcwWbG5hRaBKK95a9RDbzm0 DbIKrh2iy+RBplyGn46hp2OIBjNlQJR+ONpOlxRimbqykwQKN0we6H1Z1JkWDZW0N4ni gmGJul945nLi2z1JuzGGh6X7qakIab2BytIFLRtzv4F6nRh1p5kNdiVCeS5JRS1szhBk DGXfpgEagm6NPzp+qjMuNnO7lA2K9NEw860CWd+6+LkwGJZqOVxOtvigE1worLaI6Isf 7JgYeXd4bVkyr6fnG03g+d79Y3mmdBPVTISb57UPx97YY54P/swiNUytcFLbTQlr4tlJ isww== X-Gm-Message-State: AOAM530pKBXG8G8Ny8VYINCzr8Bw99yHLm4xeWs1EfZHnL03u8iQ78lh UGUScgxV3M3YdIMybBnRDgc= X-Google-Smtp-Source: ABdhPJypGwDcggSc+D9jBWo7QVB6Gf3B0JbJBOAB7wU/sYfZgSa71uZiwWYV2fs6rUFobi/Xi9NZgw== X-Received: by 2002:ad4:500c:: with SMTP id s12mr19512821qvo.101.1597755927786; Tue, 18 Aug 2020 06:05:27 -0700 (PDT) Received: from ?IPv6:2620:10d:c0a8:1102:2409:d99a:6a31:3631? ([2620:10d:c091:480::1:d440]) by smtp.googlemail.com with ESMTPSA id d198sm20732681qke.129.2020.08.18.06.05.26 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 18 Aug 2020 06:05:26 -0700 (PDT) To: GCC Patches From: Nathan Sidwell Subject: c++: Move hidden-lambda entity lookup checking Message-ID: <1fd4a2b1-f186-c03c-54d2-bebdff40041a@acm.org> Date: Tue, 18 Aug 2020 09:05:25 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 Content-Language: en-US X-Spam-Status: No, score=-9.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_EF, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: , Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" Hidden lambda entities only occur in block and class scopes. There's no need to check for them on every lookup. So moving that particular piece of validation to lookup_name_1, which cares. Also reordered the namespace and type checking, as that is also simpler. gcc/cp/ * name-lookup.c (qualify_lookup): Drop lambda checking here. Reorder namespace & type checking. (lookup_name_1): Do hidden lambda checking here. pushed diff --git i/gcc/cp/name-lookup.c w/gcc/cp/name-lookup.c index ad9c92da254..c68ea09e610 100644 --- i/gcc/cp/name-lookup.c +++ w/gcc/cp/name-lookup.c @@ -5221,24 +5221,16 @@ qualify_lookup (tree val, LOOK_want want) if (val == NULL_TREE) return false; - if (bool (want & LOOK_want::NAMESPACE) && TREE_CODE (val) == NAMESPACE_DECL) - return true; - if (bool (want & LOOK_want::TYPE)) { tree target_val = strip_using_decl (val); - if (TREE_CODE (target_val) == TYPE_DECL - || TREE_CODE (target_val) == TEMPLATE_DECL) + if (TREE_CODE (STRIP_TEMPLATE (target_val)) == TYPE_DECL) return true; } if (bool (want & LOOK_want::TYPE_NAMESPACE)) - return false; - - /* Look through lambda things that we shouldn't be able to see. */ - if (!bool (want & LOOK_want::HIDDEN_LAMBDA) && is_lambda_ignored_entity (val)) - return false; + return TREE_CODE (val) == NAMESPACE_DECL; return true; } @@ -6430,7 +6422,10 @@ lookup_name_1 (tree name, LOOK_where where, LOOK_want want) tree val = NULL_TREE; gcc_checking_assert (unsigned (where) != 0); - + /* If we're looking for hidden lambda things, we shouldn't be + looking in namespace scope. */ + gcc_checking_assert (!bool (want & LOOK_want::HIDDEN_LAMBDA) + || !bool (where & LOOK_where::NAMESPACE)); query_oracle (name); /* Conversion operators are handled specially because ordinary @@ -6481,7 +6476,10 @@ lookup_name_1 (tree name, LOOK_where where, LOOK_want want) continue; /* If this is the kind of thing we're looking for, we're done. */ - if (qualify_lookup (iter->value, want)) + if (iter->value + && (bool (want & LOOK_want::HIDDEN_LAMBDA) + || !is_lambda_ignored_entity (iter->value)) + && qualify_lookup (iter->value, want)) binding = iter->value; else if (bool (want & LOOK_want::TYPE) && qualify_lookup (iter->type, want))