From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 96868 invoked by alias); 7 Jun 2016 14:27:25 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 95394 invoked by uid 89); 7 Jun 2016 14:27:24 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.3 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD,SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=consulted 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 (AES256-GCM-SHA384 encrypted) ESMTPS; Tue, 07 Jun 2016 14:27:23 +0000 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 91DAF7F352; Tue, 7 Jun 2016 14:27:22 +0000 (UTC) Received: from [127.0.0.1] (ovpn01.gateway.prod.ext.ams2.redhat.com [10.39.146.11]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u57ERKip020806; Tue, 7 Jun 2016 10:27:21 -0400 From: Pedro Alves Subject: Re: [RFA 3/3] Move logic out of symbol_find_demangled_name To: Tom Tromey , Yao Qi References: <1465051760-25840-1-git-send-email-tom@tromey.com> <1465051760-25840-4-git-send-email-tom@tromey.com> <86mvmywgj1.fsf@gmail.com> <8760tl6xbf.fsf@tromey.com> Cc: gdb-patches@sourceware.org Message-ID: <9b062e13-3541-b122-2da8-1c61fe7fe55b@redhat.com> Date: Tue, 07 Jun 2016 14:27:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.1.0 MIME-Version: 1.0 In-Reply-To: <8760tl6xbf.fsf@tromey.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-SW-Source: 2016-06/txt/msg00135.txt.bz2 On 06/07/2016 12:41 PM, Tom Tromey wrote: > - if (gsymbol->language == language_cplus > - || gsymbol->language == language_rust > - || gsymbol->language == language_auto) > - { > - demangled = > - gdb_demangle (mangled, DMGL_PARAMS | DMGL_ANSI); > - if (demangled != NULL) > - { > - gsymbol->language = language_cplus; > - return demangled; > - } > - } Before, this would set language to language_cplus, even if the symbol's language was Rust. > +/* la_sniff_by_symbol for Rust. */ > + > +static int > +rust_sniff_by_symbol (const char *mangled, char **demangled) > +{ > + *demangled = gdb_demangle (mangled, DMGL_PARAMS | DMGL_ANSI); > + return 1; > +} However, this no longer forces C++, is that intended? Also, before we'd check whether gdb_demangle returned not-NULL, before taking the language, but now several languages return 1 even if gdb_demangle returns NULL: > +/* la_sniff_by_symbol for Java. */ > + > +static int > +java_sniff_by_symbol (const char *mangled, char **demangled) > +{ > + *demangled = java_demangle (mangled, DMGL_PARAMS | DMGL_ANSI); > + return 1; > +} > + Seems like the first language to be consulted always wins? Is that intended? Thanks, Pedro Alves