From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by sourceware.org (Postfix) with ESMTPS id DBFD6385E00B for ; Wed, 25 Mar 2020 11:08:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org DBFD6385E00B Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=andrew.burgess@embecosm.com Received: by mail-wm1-x344.google.com with SMTP id b12so1936063wmj.3 for ; Wed, 25 Mar 2020 04:08:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=zHcuU0mxk3c9V3niYDO3E7aPkfYzteVEdgujYTPhFu4=; b=QPIi4HXzc/lzQuy6U+c7XxRf9y4B4c4UECo9BH+3Wji2i3S8YbbKpELHWLdtfQ3zfW 4sQ4mZV2m4T7hcPGStGeQssTtazS0S4u8YlKQbN0oxEKI4XMEfk/wsB7fIGFlfC8MwDA TuHOCE0OuvqoMdJQDXhNr6Koc4YxkXWDH+tjVVKjZm0QKte2W55cLaJnqP6Ea/qOwKwl eds4GcI5Uf6teDbQyeKP7or37f3Mw+q1c9W74PSAsQCP23LQYeeGVCkDeEFaMPTvDCmC ocApb15lfgji9GgTe1jNeRrZlmzUjolQwN5+2N+JicwEcprR68FeRKpgb6gP3kadWiYU 3IRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=zHcuU0mxk3c9V3niYDO3E7aPkfYzteVEdgujYTPhFu4=; b=B27zZMoFF3AmxVkhCaAHajtFBqV8s1YFW1t5CEbBfG8tcKrfSB0Gvu+H6BUghLiOsv 9hEiNs+tAeWxg4F7JcxwID26V8LMXyWmUpAuvxTXlIkvKpi6nrdIYnxzvEAz0wHpuviM gephSkgmB8a3IOs5arlKIHcAgrSVk7R4domLIAKFLyC/LqpSswDCdfAlWIFFa4vzQuZz BCY6IRxZc4J3fq1z7qBYnjcZBY99WgFA6kt2DSjOEfdj9ZsGJsNpGCWgm21dGolOGkG4 qU00WZyQBsJyJj/+QjrkfV2YyrLbd1WOspi1XHheGkkidTsFFimqqLXwybBk3UIh4652 dIZQ== X-Gm-Message-State: ANhLgQ0QyutnP2lYCQVB/Vna3b9WeKpWN0rLEf3xkFoZTqIlszsZ3GOb N2263fZbwy39mPshi6JaF1Hla21AhhY= X-Google-Smtp-Source: ADFU+vv6CLvOIsQg2ZM6zwqC/qb2KjcsbkE+J9eoaAE9AA3o47+s+FmQfooriiPtLGqNx2GwYy9lOA== X-Received: by 2002:a05:600c:228f:: with SMTP id 15mr3054256wmf.140.1585134527768; Wed, 25 Mar 2020 04:08:47 -0700 (PDT) Received: from localhost (host86-186-80-207.range86-186.btcentralplus.com. [86.186.80.207]) by smtp.gmail.com with ESMTPSA id z21sm8456267wmf.28.2020.03.25.04.08.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 25 Mar 2020 04:08:46 -0700 (PDT) Date: Wed, 25 Mar 2020 11:08:45 +0000 From: Andrew Burgess To: Bernd Edlinger Cc: "gdb-patches@sourceware.org" Subject: Re: [PATCHv2] Fix an undefined behavior in record_line Message-ID: <20200325110845.GV3317@embecosm.com> References: <20200324091013.GT3317@embecosm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Operating-System: Linux/4.18.19-100.fc27.x86_64 (x86_64) X-Uptime: 10:53:45 up 39 days, 22:22, X-Fortune: In Denver it is unlawful to lend your vacuum cleaner to your next-door neighbor. X-Editor: GNU Emacs [ http://www.gnu.org/software/emacs ] User-Agent: Mutt/1.9.2 (2017-12-15) X-Spam-Status: No, score=-26.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Mar 2020 11:08:50 -0000 * Bernd Edlinger [2020-03-24 11:20:25 +0100]: > > > On 3/24/20 10:10 AM, Andrew Burgess wrote: > > * Bernd Edlinger [2020-03-23 22:25:42 +0100]: > > > >> On 3/22/20 4:25 AM, Bernd Edlinger wrote: > >>> On 3/13/20 12:55 PM, Bernd Edlinger wrote: > >>>> Additionally do not completely remove symbols > >>>> at the same PC than the end marker, instead > >>>> make them non-is-stmt breakpoints. > >>>> > >>>> Also fix the condition when the line table need to be resized, > >>>> that was wasting one element. > > > > I suspect this commit message has evolved overtime - having the first > > word be "additionally" seems a little strange. > > > > I'll re-think the commit message, thanks. > > >>>> > >>>> 2020-03-10 Bernd Edlinger > >>>> * buildsym.c (record_line): Fix ub and preserve lines at eof. > > > > Typo: ub -> up > > > >>>> --- > >>>> gdb/buildsym.c | 28 +++++++++++----------------- > >>>> 1 file changed, 11 insertions(+), 17 deletions(-) > >>>> > >>>> diff --git a/gdb/buildsym.c b/gdb/buildsym.c > >>>> index 7155db3..960a36c 100644 > >>>> --- a/gdb/buildsym.c > >>>> +++ b/gdb/buildsym.c > >>>> @@ -695,7 +695,7 @@ struct blockvector * > >>>> } > >>>> } > >>>> > >>>> - if (subfile->line_vector->nitems + 1 >= subfile->line_vector_length) > >>>> + if (subfile->line_vector->nitems >= subfile->line_vector_length) > >>>> { > >>>> subfile->line_vector_length *= 2; > >>>> subfile->line_vector = (struct linetable *) > >>>> @@ -705,27 +705,21 @@ struct blockvector * > >>>> * sizeof (struct linetable_entry)))); > >>>> } > > > > This part seems separate to what comes below I think. This should be > > a separate commit. > > > > Okay, good point. That should be easy. > > >>>> > >>>> - /* Normally, we treat lines as unsorted. But the end of sequence > >>>> - marker is special. We sort line markers at the same PC by line > >>>> - number, so end of sequence markers (which have line == 0) appear > >>>> - first. This is right if the marker ends the previous function, > >>>> - and there is no padding before the next function. But it is > >>>> - wrong if the previous line was empty and we are now marking a > >>>> - switch to a different subfile. We must leave the end of sequence > >>>> - marker at the end of this group of lines, not sort the empty line > >>>> - to after the marker. The easiest way to accomplish this is to > >>>> - delete any empty lines from our table, if they are followed by > >>>> - end of sequence markers. All we lose is the ability to set > >>>> - breakpoints at some lines which contain no instructions > >>>> - anyway. */ > >>>> + /* The end of sequence marker is special. We need to reset the > >>>> + is_stmt flag on previous lines at the same PC, otherwise these > >>>> + lines may cause problems. All we lose is the ability to set > >>>> + breakpoints at some lines which contain no instructions > >>>> - anyway. */ > > > > You need to expand on what "problems" means here. Someone coming back > > to this code in the future will have no idea why we're making this > > change, and with no tests for this commit they can't even try to > > figure out the "problems" by looking at a test. > > > > I will try to explain that better, yes. > > >>>> if (line == 0 && subfile->line_vector->nitems > 0) > >>>> { > >>>> - e = subfile->line_vector->item + subfile->line_vector->nitems - 1; > >>>> - while (subfile->line_vector->nitems > 0 && e->pc == pc) > >>>> + e = subfile->line_vector->item + subfile->line_vector->nitems; > >>>> + do > >>>> { > >>>> e--; > >>>> - subfile->line_vector->nitems--; > >>>> + if (e->pc != pc || e->line == 0) > >>>> + break; > >>>> + e->is_stmt = 0; > >>>> } > >>>> + while (e > subfile->line_vector->item); > >>>> } > >>>> > >>>> e = subfile->line_vector->item + subfile->line_vectoms++; > >>>> > >> > >> Andrew, this is the place where currently the is-stmt entries > >> are deleted. With your is-stmt patch this code is executed in more > >> cases than before. Therefore I would suggest to convert them > >> to !is_stmt lines for now, but maybe in the long run add a new flag > >> that allows them to be used in the file:line case, but make these > >> lines behave differently when stepping, I am only trying to fix > >> the case where you step out of the subroutine. > > > > I'm super uncomfortable with any code that changes is-stmt to > > !is-stmt, as I worry about what we might be giving up. You say "All > > we lose is the ability to set breakpoints at some lines which contain > > no instructions anyway.", but I'll need to work through some examples > > to see what this actually means in practice before I can be happy with > > this change. > > > > There is no pressure from my side to do anything about it. > I am just saying is-stmt -> !is-stmt is better than removing > is-stmt lines that are at the same PC by chance. You're absolutely right, I miss-understood what was going on here. I think if you split the two parts of the patch, and could expand on the description a bit then this should be fine. My understanding of the "problem" here is that lines appear within one subfile at the same address that we switch to some other subfile. As such I think, the address will be attributed to the second subfile, and we shouldn't be reporting lines for the first subfile. Hopefully you can expand that more with your understanding. Thanks, Andrew > > I will come up with an updated patch, eventually, but will need > to spend more time on the openssl project now, to meet the schedule for the > next release. > > > Bernd.