From patchwork Fri Oct 6 15:55:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Sidwell X-Patchwork-Id: 822503 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-463660-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="ekGzDPLg"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3y7vNg1bkhz9s7G for ; Sat, 7 Oct 2017 02:55:13 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to :from:subject:message-id:date:mime-version:content-type; q=dns; s=default; b=wNesIwuZiIkzfIsoyF+FPsLI3wbo3mdHnaoja9zFJesAZplUsT 42oK6Y/7xdLhrlimA5fxRGO0oIVZoMqnSariOgm0j1ne5Hi9wSoLY0ELMSRpdQOH dig+qBgOWNG3DAtJ23nuuI+55nZivM7VmIQ1/fZkX66DLhdMrmcVkC6MI= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to :from:subject:message-id:date:mime-version:content-type; s= default; bh=7nadAvnHFksVmQTqrGbuYTnjL6U=; b=ekGzDPLgaUJugNdJ74qD 1xpDnB8wCXs2wop/307vq/eGHERhU3B/xgVofybGeTn0fTqZNiCdne0ceGOmvdb7 p4M1EiAIZ//li7U5Z0WGhuBBGSui/5W8Ic/wb7CoQeQ2XZL0thQOfXUYiuSECI3k bNz3zNPndJ2+YrGkx12/PUk= Received: (qmail 18529 invoked by alias); 6 Oct 2017 15:55:06 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 18518 invoked by uid 89); 6 Oct 2017 15:55:06 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-10.6 required=5.0 tests=BAYES_00, FREEMAIL_FROM, GIT_PATCH_2, GIT_PATCH_3, KAM_ASCII_DIVIDERS, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mail-qt0-f174.google.com Received: from mail-qt0-f174.google.com (HELO mail-qt0-f174.google.com) (209.85.216.174) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 06 Oct 2017 15:55:05 +0000 Received: by mail-qt0-f174.google.com with SMTP id d13so31555346qta.5 for ; Fri, 06 Oct 2017 08:55:05 -0700 (PDT) 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=0FAby8/ayuaBg2T4GSSoqJ27gUj5siK9VspGTEIGau4=; b=JbEXfJ0j3LKFgAKMEbZQ0oH6i2KrBWPfyPzr/y3iDt1WnRGXdyC8lxs7RAMBx+Zoqy XMahMMI3CaB72OyzC18YlddPcx8NfXPIZ+WolevXJIevxrLqzstzZvfWr/kL1h6q2LxA xVrqyjhtqEhEqE231/N4K8aUYJagiSl+RQ0eGVY4M15la38Bqt08m8iDIryNFOAxycDf M0Qx0XXrIbwgLvmONdwvLIHjGDf8MGtNIAiIu+9gc5noyS7qZnO31A8nL9j77TVcM/Zw 8vkDpU88wjXxbqgDGNnYtX0S7qV9h7qnRbv1ks0CbuZ+TvBbrMQvFzPYuiAw+CWfn8ty LKCQ== X-Gm-Message-State: AMCzsaUyhO9X5K1HauvZorRPSvj072JwMfY/Vhmeh7Rm6yRnn/GxJqBm crDXYp5+VDDmCfMjvKm5O+0= X-Google-Smtp-Source: AOwi7QBX8rggAAPm32hZ28zH0f1tFdhtEcUu1debLtdQk4a7z8nsKs4WYkQ7ZPL3vT3NoAirrwhjqg== X-Received: by 10.129.164.19 with SMTP id b19mr2026731ywh.198.1507305303275; Fri, 06 Oct 2017 08:55:03 -0700 (PDT) Received: from ?IPv6:2620:10d:c0a3:20fb:7500:e7fb:4a6f:2254? ([2620:10d:c091:200::2:a03f]) by smtp.googlemail.com with ESMTPSA id e14sm1778415ywe.1.2017.10.06.08.55.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 06 Oct 2017 08:55:02 -0700 (PDT) To: GCC Patches From: Nathan Sidwell Subject: [PR c++/82424] Dont convert dependent types Message-ID: Date: Fri, 6 Oct 2017 11:55:01 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 This fixes crash with -Wshadow=compatible-local, where we ended up trying to convert to or from a dependent type. Rather than skip that out right, I see if the types are the same (dependent or not) before also trying convert in the non-dependent case. I suppose I could try matching unqualified variants, but that's probably a slippery slope. Applying to trunk. nathan 2017-10-06 Nathan Sidwell cp/ PR c++/82424 * name-lookup.c (check_local_shadow): Don't try and convert dependent types. testsuite/ PR c++/82424 * g++.dg/warn/pr82424.C: New. Index: cp/name-lookup.c =================================================================== --- cp/name-lookup.c (revision 253493) +++ cp/name-lookup.c (working copy) @@ -2728,7 +2728,11 @@ check_local_shadow (tree decl) else if (warn_shadow_local) warning_code = OPT_Wshadow_local; else if (warn_shadow_compatible_local - && can_convert (TREE_TYPE (old), TREE_TYPE (decl), tf_none)) + && (same_type_p (TREE_TYPE (old), TREE_TYPE (decl)) + || (!dependent_type_p (TREE_TYPE (decl)) + && !dependent_type_p (TREE_TYPE (old)) + && can_convert (TREE_TYPE (old), TREE_TYPE (decl), + tf_none)))) warning_code = OPT_Wshadow_compatible_local; else return; Index: testsuite/g++.dg/warn/pr82424.C =================================================================== --- testsuite/g++.dg/warn/pr82424.C (revision 0) +++ testsuite/g++.dg/warn/pr82424.C (working copy) @@ -0,0 +1,20 @@ +// { dg-additional-options "-Wshadow=compatible-local" } + +// pr c++/82424 we were trying to convert between dependent types. +template class a +{ + struct b; + template void c (); +}; +template +template +void +a::c () +{ + typedef typename T::b b; // Don't go looking inside the typename + T thing; + { + T thing; // { dg-warning "shadows a previous local" } + } +} +