From patchwork Tue May 24 03:59:27 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 97121 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 85921B6FB5 for ; Tue, 24 May 2011 13:59:45 +1000 (EST) Received: (qmail 886 invoked by alias); 24 May 2011 03:59:43 -0000 Received: (qmail 877 invoked by uid 22791); 24 May 2011 03:59:42 -0000 X-SWARE-Spam-Status: No, hits=-6.3 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_HI, SPF_HELO_PASS, T_RP_MATCHES_RCVD 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; Tue, 24 May 2011 03:59:28 +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 p4O3xS92022328 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 23 May 2011 23:59:28 -0400 Received: from [127.0.0.1] ([10.3.113.3]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p4O3xRNB004351 for ; Mon, 23 May 2011 23:59:28 -0400 Message-ID: <4DDB2D1F.1010305@redhat.com> Date: Mon, 23 May 2011 23:59:27 -0400 From: Jason Merrill User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.17) Gecko/20110428 Fedora/3.1.10-1.fc14 Lightning/1.0b2 Thunderbird/3.1.10 MIME-Version: 1.0 To: gcc-patches List Subject: Re: RFA (libstdc++): C++/v3 PATCH for c++/24163 (lookup in dependent bases) and c++/29131 References: <4DD69790.8070101@redhat.com> In-Reply-To: <4DD69790.8070101@redhat.com> 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 It occurred to me today that I could use current_class_name rather than TYPE_IDENTIFIER (current_class_type). Tested x86_64-pc-linux-gnu, applied to trunk. commit d40ebc9ef2be8ab9b4d71410d9797442b2c16d9a Author: Jason Merrill Date: Mon May 23 15:23:42 2011 -0400 * pt.c (tsubst_copy_and_build): Use current_class_name. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 4299733..dbff91e 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -13017,8 +13017,7 @@ tsubst_copy_and_build (tree t, else inform (EXPR_LOC_OR_HERE (t), "use %<%T::%D%> instead", - TYPE_IDENTIFIER (current_class_type), - function); + current_class_name, function); } else inform (0, "%q+D declared here, later in the "