From patchwork Wed Mar 26 15:33:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Seitz X-Patchwork-Id: 296 Return-Path: X-Original-To: siddhesh@wilcox.dreamhost.com Delivered-To: siddhesh@wilcox.dreamhost.com Received: from homiemail-mx20.g.dreamhost.com (caibbdcaaahc.dreamhost.com [208.113.200.72]) by wilcox.dreamhost.com (Postfix) with ESMTP id CE36E3601C8 for ; Wed, 26 Mar 2014 08:34:06 -0700 (PDT) Received: by homiemail-mx20.g.dreamhost.com (Postfix, from userid 14314964) id 7F9B140C6F412; Wed, 26 Mar 2014 08:34:06 -0700 (PDT) X-Original-To: gdb@patchwork.siddhesh.in Delivered-To: x14314964@homiemail-mx20.g.dreamhost.com 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 homiemail-mx20.g.dreamhost.com (Postfix) with ESMTPS id 56A2B40C6F407 for ; Wed, 26 Mar 2014 08:34:06 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:message-id:date:from:mime-version:to:cc :subject:references:in-reply-to:content-type; q=dns; s=default; b= rKbuuSRULkwltA/6fZjCeZKVXgyTrwdVDRj3+3T2pNSp2B8IUseL3AQvJRVDJPk1 +9stjIgGxX7cWx0wuMPnwnbsj/u3WW/cPAOKIN3mNJc4JbN08dNdkjli1VIn9VtU Hy55JaCRmsG8lmg+U5tjPEVcYsWnaTEC0kpZLPBrFQg= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:message-id:date:from:mime-version:to:cc :subject:references:in-reply-to:content-type; s=default; bh=XApq rXmvRdgbh6T5bhlJpauXMHE=; b=sTbk70wBke7c+pOUJdeGopdS/z4ybweT01SD AiBMhOS+ShMaeDtdjTCYtM7ZTf4Mz/NAPbZaMMNiGuaUeX8T0BxW1WXkvgjqD0d2 HuGXIXlqPafXhU/yNq2/bj35l3fFUXKoxdRHJwZTYCocKlJjpaKhyfVkm+rJ973T 4S59BI8= Received: (qmail 9327 invoked by alias); 26 Mar 2014 15:34:03 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 9312 invoked by uid 89); 26 Mar 2014 15:34:02 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 26 Mar 2014 15:34:02 +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 s2QFXvSp031433 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 26 Mar 2014 11:33:58 -0400 Received: from valrhona.uglyboxes.com (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s2QFXufQ022631 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Wed, 26 Mar 2014 11:33:56 -0400 Message-ID: <5332F364.9090805@redhat.com> Date: Wed, 26 Mar 2014 08:33:56 -0700 From: Keith Seitz User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.3.0 MIME-Version: 1.0 To: Joel Brobecker CC: "gp >> \"gdb-patches@sourceware.org ml\"" Subject: Re: [RFA] Fix c++/16253 (tag/variable name collision) References: <532C810F.7010809@redhat.com> <20140326134048.GA24501@adacore.com> In-Reply-To: <20140326134048.GA24501@adacore.com> X-IsSubscribed: yes X-DH-Original-To: gdb@patchwork.siddhesh.in On 03/26/2014 06:40 AM, Joel Brobecker wrote: > Hey again, Keith, > > Would you mind committing the ada-tasks.c change now, and separately > from the rest? It's an improvement on its own. FTR, I tested this part > of the patch isolated from the rest on x86_64-linux. Sure. I've pushed the following patch/ChangeLog. Keith ChangeLog 2014-03-26 Keith Seitz * ada-tasks.c (get_tcb_types_info): Search STRUCT_DOMAIN for types, not VAR_DOMAIN. diff --git a/gdb/ada-tasks.c b/gdb/ada-tasks.c index 8b37f51..585c1f6 100644 --- a/gdb/ada-tasks.c +++ b/gdb/ada-tasks.c @@ -470,24 +470,24 @@ get_tcb_types_info (void) C-like) lookups to get the first match. */ struct symbol *atcb_sym = - lookup_symbol_in_language (atcb_name, NULL, VAR_DOMAIN, + lookup_symbol_in_language (atcb_name, NULL, STRUCT_DOMAIN, language_c, NULL); const struct symbol *common_atcb_sym = - lookup_symbol_in_language (common_atcb_name, NULL, VAR_DOMAIN, + lookup_symbol_in_language (common_atcb_name, NULL, STRUCT_DOMAIN, language_c, NULL); const struct symbol *private_data_sym = - lookup_symbol_in_language (private_data_name, NULL, VAR_DOMAIN, + lookup_symbol_in_language (private_data_name, NULL, STRUCT_DOMAIN, language_c, NULL); const struct symbol *entry_call_record_sym = - lookup_symbol_in_language (entry_call_record_name, NULL, VAR_DOMAIN, + lookup_symbol_in_language (entry_call_record_name, NULL, STRUCT_DOMAIN, language_c, NULL); if (atcb_sym == NULL || atcb_sym->type == NULL) { /* In Ravenscar run-time libs, the ATCB does not have a dynamic size, so the symbol name differs. */ - atcb_sym = lookup_symbol_in_language (atcb_name_fixed, NULL, VAR_DOMAIN, - language_c, NULL); + atcb_sym = lookup_symbol_in_language (atcb_name_fixed, NULL, + STRUCT_DOMAIN, language_c, NULL); if (atcb_sym == NULL || atcb_sym->type == NULL) error (_("Cannot find Ada_Task_Control_Block type. Aborting"));