From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 111437 invoked by alias); 10 Jul 2018 01:52:28 -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 111229 invoked by uid 89); 10 Jul 2018 01:52:27 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: simark.ca Received: from simark.ca (HELO simark.ca) (158.69.221.121) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 10 Jul 2018 01:52:26 +0000 Received: from [10.0.0.11] (unknown [192.222.164.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id D0C921E08D; Mon, 9 Jul 2018 21:52:24 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=simark.ca; s=mail; t=1531187545; bh=XkVS9kTaxd3hau9T/3fimLkJ2NFm+3y4y5j312u47b0=; h=Subject:To:References:From:Date:In-Reply-To:From; b=MB/zsA2riUzEEUMzAivk78MIcCVMs1G4hrJx8lBUV4UpSQaOq305K326tsHz1S33G PKKDDpGf+4Ro2c7KQcrZ9Vo7kGojA5rxxtqsj3BEs3Kax4B6Se/mvkyKuHgK2bnM2e Q782XX6Rgnp/67hxKHddE46OLb4v3PdBh+1ELT+U= Subject: Re: [RFA 22/42] Move current_subfile to buildsym_compunit To: Tom Tromey , gdb-patches@sourceware.org References: <20180523045851.11660-1-tom@tromey.com> <20180523045851.11660-23-tom@tromey.com> From: Simon Marchi Message-ID: <23187a74-b311-04d9-9d6c-82d1ace69f5f@simark.ca> Date: Tue, 10 Jul 2018 01:52:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 MIME-Version: 1.0 In-Reply-To: <20180523045851.11660-23-tom@tromey.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-SW-Source: 2018-07/txt/msg00237.txt.bz2 > @@ -901,8 +902,10 @@ void > push_subfile () > { > gdb_assert (buildsym_compunit != nullptr); > - gdb_assert (! (current_subfile == NULL || current_subfile->name == NULL)); > - buildsym_compunit->m_subfile_stack.push_back (current_subfile->name); > + gdb_assert (! (buildsym_compunit->m_current_subfile == NULL > + || buildsym_compunit->m_current_subfile->name == NULL)); Here, you might as well write two separate asserts. gdb_assert (buildsym_compunit->m_current_subfile != NULL); gdb_assert (buildsym_compunit->m_current_subfile->name != NULL); Otherwise, LGTM. Simon