From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 46088 invoked by alias); 12 Jul 2018 04:34:02 -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 46072 invoked by uid 89); 12 Jul 2018 04:34:02 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-3.2 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_NONE,SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=sk:buildsy, current_subfile X-HELO: gateway24.websitewelcome.com Received: from gateway24.websitewelcome.com (HELO gateway24.websitewelcome.com) (192.185.51.110) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 12 Jul 2018 04:33:59 +0000 Received: from cm16.websitewelcome.com (cm16.websitewelcome.com [100.42.49.19]) by gateway24.websitewelcome.com (Postfix) with ESMTP id 219526801 for ; Wed, 11 Jul 2018 23:33:57 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id dTIZfYn2raSeydTIefBqVP; Wed, 11 Jul 2018 23:33:57 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=/3rlcpHb+P4cQDpXP8CiKasY7OqSMrpgNyAYpFejILg=; b=Q3MeBlfyxxmekyCHOwPDpgcyve 21RFqT/+dotViLDaRe8sSj6Kq1kykNZAnyFtRFUevnr8DrerZ0KNDbJZxRI043EXO2XUU9UCr6HM7 7sTFi52Y+lNmER/FK3z1b5636; Received: from 75-166-85-72.hlrn.qwest.net ([75.166.85.72]:57078 helo=bapiya) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1fdTIY-00337j-SV; Wed, 11 Jul 2018 23:33:46 -0500 From: Tom Tromey To: Simon Marchi Cc: Tom Tromey , gdb-patches@sourceware.org Subject: Re: [RFA 22/42] Move current_subfile to buildsym_compunit References: <20180523045851.11660-1-tom@tromey.com> <20180523045851.11660-23-tom@tromey.com> <23187a74-b311-04d9-9d6c-82d1ace69f5f@simark.ca> Date: Thu, 12 Jul 2018 04:34:00 -0000 In-Reply-To: <23187a74-b311-04d9-9d6c-82d1ace69f5f@simark.ca> (Simon Marchi's message of "Mon, 9 Jul 2018 21:52:24 -0400") Message-ID: <87o9fdcbti.fsf@tromey.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-SW-Source: 2018-07/txt/msg00330.txt.bz2 >>>>> "Simon" == Simon Marchi writes: >> @@ -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)); Simon> Here, you might as well write two separate asserts. Simon> gdb_assert (buildsym_compunit->m_current_subfile != NULL); Simon> gdb_assert (buildsym_compunit->m_current_subfile->name != NULL); Simon> Otherwise, LGTM. I made this change. Tom