From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 63261 invoked by alias); 23 Jul 2015 17:51:54 -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 63239 invoked by uid 89); 23 Jul 2015 17:51:53 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-4.0 required=5.0 tests=AWL,BAYES_00,KAM_LAZY_DOMAIN_SECURITY,RP_MATCHES_RCVD,SPF_HELO_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 (AES256-GCM-SHA384 encrypted) ESMTPS; Thu, 23 Jul 2015 17:51:52 +0000 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 872172CD7E1 for ; Thu, 23 Jul 2015 17:51:51 +0000 (UTC) Received: from pinnacle.lan (ovpn-113-75.phx2.redhat.com [10.3.113.75]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t6NHpo8j029974 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA256 bits=256 verify=NO) for ; Thu, 23 Jul 2015 13:51:51 -0400 Date: Thu, 23 Jul 2015 17:51:00 -0000 From: Kevin Buettner To: gdb-patches@sourceware.org Subject: Re: [PATCH] Add proper handling for non-local references in nested functions Message-ID: <20150723105146.135ac8fd@pinnacle.lan> In-Reply-To: <55B12580.9080608@adacore.com> 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> <55B12580.9080608@adacore.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-IsSubscribed: yes X-SW-Source: 2015-07/txt/msg00655.txt.bz2 On Thu, 23 Jul 2015 19:33:52 +0200 Pierre-Marie de Rodat wrote: > 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". I think you're right. Sorry for the false alarm! > > 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. I'll look into this too. Thanks! Kevin