From patchwork Sat Mar 16 19:28:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 228243 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 2AB8C2C00B1 for ; Sun, 17 Mar 2013 06:28:44 +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=1364066925; 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=Lm9KQyd cGxWNMbIhbvVBrY74JPQ=; b=AnbZohJALpg808qxwFaBVln5EPhgmBldQLs3swD l22UYgW4AEzhKKbmciv5Whm45cbAGC0J4VTZj1T09gW24gjK5CyTmdwHGv+qy821 YFVslFnr+PwmV6W2obi3ZlFe+zjB4qAt84e5V1HM4hEmaHLPpoULTM77ybj3Svb0 W90o= 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=ahq5wnkHpmHtMj9KSfbIkjPyEj22vTeQ6DcvfPTTvqZr2dwISxNRvuDqf2BDNu kRKcg2U+wQk5hgLMfrV0McTVvbPu4Csq5X26InQ0ExqJIztRi5B20AVgpLxNcveC M7KM0Bq3NOpctzlpaDb/RUQlbElyKggeD0Nl/TlMyInjA=; Received: (qmail 1684 invoked by alias); 16 Mar 2013 19:28:39 -0000 Received: (qmail 1651 invoked by uid 22791); 16 Mar 2013 19:28:36 -0000 X-SWARE-Spam-Status: No, hits=-7.6 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, 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; Sat, 16 Mar 2013 19:28:30 +0000 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2GJSTB3013033 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sat, 16 Mar 2013 15:28:30 -0400 Received: from [10.3.113.8] ([10.3.113.8]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r2GJSSZ8015866 for ; Sat, 16 Mar 2013 15:28:29 -0400 Message-ID: <5144C7DB.3090500@redhat.com> Date: Sat, 16 Mar 2013 15:28:27 -0400 From: Jason Merrill User-Agent: Mozilla/5.0 (X11; Linux i686; rv:21.0) Gecko/20100101 Thunderbird/21.0a2 MIME-Version: 1.0 To: gcc-patches List Subject: C++ PATCH for c++/54277 (wrong cv-quals in lambda) 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 I have no idea why the existing code tried to deduce the desired quals from current_class_ref rather than just look at the object it has. That gives the wrong answer if current_class_ref is for a lambda. Tested x86_64-pc-linux-gnu, applying to trunk. commit 6a9b91f58b18503ae7a4a55fe494c0336df10484 Author: Jason Merrill Date: Fri Feb 15 14:14:12 2013 -0500 PR c++/54277 * semantics.c (finish_non_static_data_member): Get the quals from the object. diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index efe09bb..d0cdf8b 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -1574,9 +1574,7 @@ finish_non_static_data_member (tree decl, tree object, tree qualifying_scope) else { /* Set the cv qualifiers. */ - int quals = (current_class_ref - ? cp_type_quals (TREE_TYPE (current_class_ref)) - : TYPE_UNQUALIFIED); + int quals = cp_type_quals (TREE_TYPE (object)); if (DECL_MUTABLE_P (decl)) quals &= ~TYPE_QUAL_CONST; diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this9.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this9.C new file mode 100644 index 0000000..07ddd08 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this9.C @@ -0,0 +1,19 @@ +// PR c++/54277 +// { dg-do compile { target c++11 } } + +struct Used +{ + void foo() { } +}; + +template +struct S +{ + Used x; + + void bar() + { + auto f = [this] { x.foo(); }; + f(); + } +};