From patchwork Wed Feb 6 04:24:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 218486 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id A4E602C02BC for ; Wed, 6 Feb 2013 15:24:56 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1360729497; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Message-ID:Date:From:User-Agent:MIME-Version:To:Subject: Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:Sender:Delivered-To; bh=ZlTr9n8 z7aATWgR80P0MbSL1KvE=; b=x82IZ8/YAdH5JM3rkNVmxFzYZJQTPQ27UN5cHip kSoUQ9Uqjb8uArOsUg7yUwTpB2GX/TQ7iAYmVMVMHrM4vts/Yg/zVSA7rqARsY2G Ody1mm4Gvr48RhGQbjFXnCWXnjHjNrnnd5A00U8hBi7EsG85KqCyuYFrM3IoIAXp Ak5U= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Message-ID:Date:From:User-Agent:MIME-Version:To:Subject:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=jiI8jCBjq0fcxvbmxcIHoGA8CLpQx9K8nekZ4YuGuOO4VkU9UzpAgRdphLfz9p 51DP6+xWNv9xK5drWk4YMPuLGRhiFOJWbtqjwd+zEHzB3nUUKaXje8XFYVBHpCWn TQA7RiYDPC4Gh7hMKBMfnp6zoFbPOw1P7wxtSF3EWzYNA=; Received: (qmail 30204 invoked by alias); 6 Feb 2013 04:24:37 -0000 Received: (qmail 30049 invoked by uid 22791); 6 Feb 2013 04:24:32 -0000 X-SWARE-Spam-Status: No, hits=-6.3 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, KHOP_SPAMHAUS_DROP, RCVD_IN_DNSWL_HI, RCVD_IN_HOSTKARMA_W, RP_MATCHES_RCVD, SPF_HELO_PASS X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 06 Feb 2013 04:24:22 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r164OLdJ015651 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 5 Feb 2013 23:24:21 -0500 Received: from [10.3.113.22] (ovpn-113-22.phx2.redhat.com [10.3.113.22]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r164OK3c025714 for ; Tue, 5 Feb 2013 23:24:21 -0500 Message-ID: <5111DAF4.70206@redhat.com> Date: Tue, 05 Feb 2013 23:24:20 -0500 From: Jason Merrill User-Agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/20130110 Thunderbird/17.0.2 MIME-Version: 1.0 To: gcc-patches List Subject: C++ PATCH for c++/54122 (ICE with 'this' capture) 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 We were crashing in lvalue_kind because we were trying to test whether a NULL type was a METHOD_TYPE. The reason we would care whether the type is a METHOD_TYPE is lost to history; the change was there in the first version of that function that appeared in 1995. Tested x86_64-pc-linux-gnu, applying to trunk. commit 19ec4361510b137bc60631193cd47e378fc1b314 Author: Jason Merrill Date: Tue Feb 5 23:04:01 2013 -0500 PR c++/54122 * tree.c (lvalue_kind) [INDIRECT_REF]: Don't check for METHOD_TYPE. diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c index d1f14fc..18d9a98 100644 --- a/gcc/cp/tree.c +++ b/gcc/cp/tree.c @@ -143,9 +143,7 @@ lvalue_kind (const_tree ref) case ARRAY_REF: case PARM_DECL: case RESULT_DECL: - if (TREE_CODE (TREE_TYPE (ref)) != METHOD_TYPE) - return clk_ordinary; - break; + return clk_ordinary; /* A scope ref in a template, left as SCOPE_REF to support later access checking. */ diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this7.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this7.C new file mode 100644 index 0000000..6e25c33 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this7.C @@ -0,0 +1,11 @@ +// PR c++/54122 +// { dg-options -std=c++11 } + +enum E { F }; + +template +struct C +{ + E e; + void f () { auto l = [&](void)->void { if (e == F) return; }; } +};