From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10761 invoked by alias); 23 Jul 2015 17:33:58 -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 10735 invoked by uid 89); 23 Jul 2015 17:33:57 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.3 required=5.0 tests=AWL,BAYES_00,KAM_LAZY_DOMAIN_SECURITY,RCVD_IN_DNSWL_LOW autolearn=no version=3.3.2 X-HELO: smtp.eu.adacore.com Received: from mel.act-europe.fr (HELO smtp.eu.adacore.com) (194.98.77.210) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Thu, 23 Jul 2015 17:33:56 +0000 Received: from localhost (localhost [127.0.0.1]) by filtered-smtp.eu.adacore.com (Postfix) with ESMTP id 82D0528B3642; Thu, 23 Jul 2015 19:33:53 +0200 (CEST) Received: from smtp.eu.adacore.com ([127.0.0.1]) by localhost (smtp.eu.adacore.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lUfhPzq-jlUN; Thu, 23 Jul 2015 19:33:53 +0200 (CEST) Received: from [10.10.1.112] (cacatoes.act-europe.fr [10.10.1.112]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.eu.adacore.com (Postfix) with ESMTPSA id DEAB728B2744; Thu, 23 Jul 2015 19:33:52 +0200 (CEST) Subject: Re: [PATCH] Add proper handling for non-local references in nested functions To: Kevin Buettner , gdb-patches@sourceware.org References: <54F47563.4050103@adacore.com> <54FF0D05.70907@redhat.com> <550C1170.9070208@adacore.com> <55685B60.3000004@redhat.com> <55775EB0.4080701@adacore.com> <55AF5F7E.5000600@adacore.com> <20150722173957.7ed51f18@pinnacle.lan> <55B0C583.6050601@adacore.com> <20150723064408.4dd8a9b2@pinnacle.lan> <55B112D4.5010304@adacore.com> <20150723102151.1b63fa2e@pinnacle.lan> From: Pierre-Marie de Rodat Message-ID: <55B12580.9080608@adacore.com> Date: Thu, 23 Jul 2015 17:33:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.0.1 MIME-Version: 1.0 In-Reply-To: <20150723102151.1b63fa2e@pinnacle.lan> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-IsSubscribed: yes X-SW-Source: 2015-07/txt/msg00654.txt.bz2 On 07/23/2015 07:21 PM, Kevin Buettner wrote: > I ran into another issue, both yesterday and today, when attempting to > apply your patch. Apparently, it adds some test cases, > gdb.base/nested-subp1.c, gdb.base/nested-subp1.exp, etc. which already > exist. As can be seen in the log below, I told patch to not assume -R > as well as to not apply the patch. I'm using sources, current as of > yesterday, upon which I first applied your other patch, > 0001-Replace-the-block_found-global-with-explicit-data-fl.patch. Huh, strange! I think you have a dirty source tree: I just fetched the upstream repository and I have this: $ git annotate fsf/master -- gdb/testsuite/gdb.base/nested-subp1.exp fatal: no such path gdb/testsuite/gdb.base/nested-subp1.exp in fsf/master So I guess you should check the state of your source tree with "git status". > Here's the log showing the issue I ran into: > > [kev@pinnacle gdb]$ patch -p2 patching file ada-lang.c > [...] > The next patch would create the file testsuite/gdb.base/nested-subp1.c, > which already exists! Assume -R? [n] n > Apply anyway? [n] n > [...] I would suggest you to use "git am" to import patches: this will keep track of which change comes from which commit. If you want a quick discussion for this matter, I'm on IRC (#gdb), by the way. -- Pierre-Marie de Rodat