From patchwork Sun Sep 23 04:08:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 29508 Received: (qmail 86901 invoked by alias); 23 Sep 2018 04:08:57 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 86708 invoked by uid 89); 23 Sep 2018 04:08:55 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.3 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy= X-HELO: gateway24.websitewelcome.com Received: from gateway24.websitewelcome.com (HELO gateway24.websitewelcome.com) (192.185.51.196) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 23 Sep 2018 04:08:53 +0000 Received: from cm11.websitewelcome.com (cm11.websitewelcome.com [100.42.49.5]) by gateway24.websitewelcome.com (Postfix) with ESMTP id 00F3C78FA for ; Sat, 22 Sep 2018 23:08:19 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id 3vgwgYlGvRPoj3vgwguCH0; Sat, 22 Sep 2018 23:08:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type: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=72NGMhrB/NhgLKPEEpeFbNOn8UqYvERECr+IcmGxfmo=; b=PEHGjaIPGCZSx7fUW8JiWKV6PC 3RObh7vjfsZLXiAw0lsN+tXJ2ruEk5mnPXAWBuXUM8ogedBKl6Oc14Z7FEiBCMuGbO3BZ5ZPK+mut wYmYIoGPDfb7aOrBMhh907JKY; Received: from 97-122-190-66.hlrn.qwest.net ([97.122.190.66]:37440 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1g3vgw-002UJa-ON; Sat, 22 Sep 2018 23:08:18 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 4/8] Avoid shadowing in linux-tdep.c Date: Sat, 22 Sep 2018 22:08:10 -0600 Message-Id: <20180923040814.27941-5-tom@tromey.com> In-Reply-To: <20180923040814.27941-1-tom@tromey.com> References: <20180923040814.27941-1-tom@tromey.com> This is one of the uglier changes to avoid local shadowing. Because obstack.h uses statement expressions, in some cases a nested obstack call will result in shadowing. Rather than try to fix obstack.h, this patch simply works around the one instance of this problem. gdb/ChangeLog 2018-09-22 Tom Tromey * linux-tdep.c (linux_make_mappings_corefile_notes): Introduce new variable "size". --- gdb/ChangeLog | 5 +++++ gdb/linux-tdep.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gdb/linux-tdep.c b/gdb/linux-tdep.c index 8c76ec316b..352114943f 100644 --- a/gdb/linux-tdep.c +++ b/gdb/linux-tdep.c @@ -1547,8 +1547,9 @@ linux_make_mappings_corefile_notes (struct gdbarch *gdbarch, bfd *obfd, long_type, mapping_data.file_count); /* Copy the filenames to the data obstack. */ + int size = obstack_object_size (&filename_obstack); obstack_grow (&data_obstack, obstack_base (&filename_obstack), - obstack_object_size (&filename_obstack)); + size); note_data = elfcore_write_note (obfd, note_data, note_size, "CORE", NT_FILE,