From patchwork Sat Jan 20 21:34:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 25469 Received: (qmail 75509 invoked by alias); 20 Jan 2018 21:34:37 -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 75330 invoked by uid 89); 20 Jan 2018 21:34:36 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.1 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=H*RU:209.85.128.193, Hx-spam-relays-external:209.85.128.193, 20171019, 2017-10-19 X-HELO: mail-wr0-f193.google.com Received: from mail-wr0-f193.google.com (HELO mail-wr0-f193.google.com) (209.85.128.193) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 20 Jan 2018 21:34:34 +0000 Received: by mail-wr0-f193.google.com with SMTP id g38so4651830wrd.2 for ; Sat, 20 Jan 2018 13:34:34 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=3xNHuEpPbW02az8px2NMamGDM0SUsGEbsvvs4z6VWiw=; b=SA9Ek/go2z/XNOP49lctGFAkBzYp4RVjFB2uFlXFhnIadcjlhrbFjI887yL5aHajgj 82s58kgehqUx7KgXV+A9aQMYchO01AWcm06J6rw8sFhs0Wc1YBviUxLqcCYa0RjiNe5F 6aojrtGrAnFtQprOoBYWr/iOc20nTcjaEc107+kBDhxb4Pv44FMnFLIivPM7AucLYWe+ 8Z+dgxbbN06D1yrMRW/RD4zPJxpQOHFNdGsxEdtwc84ZHNN1h1zO6zv5h6paPPjB7QOs KyZxklqnEncciOQxxuxLA5z0ZFnZwD3dMTgZuUfzATYNI/AHM1RznYIaFx08RkzNK/tu JCNg== X-Gm-Message-State: AKwxytd319FcUC4XFp9aZwh4k0J7W2UCJ34jfytRLNjz4/XyVgY7K1Tf BNMH1+NYvuhSYWjzLiRDiExIR9P7 X-Google-Smtp-Source: AH8x224quhaE9nL888eHBTecK+V5AYTIkKAEKLjhmfCEmS2Kpiqs4FYnLMuTo+BA0LOb5eoSi1YpKQ== X-Received: by 10.223.169.116 with SMTP id u107mr2055454wrc.3.1516484072287; Sat, 20 Jan 2018 13:34:32 -0800 (PST) Received: from localhost (host86-164-103-151.range86-164.btcentralplus.com. [86.164.103.151]) by smtp.gmail.com with ESMTPSA id x130sm1353778wme.26.2018.01.20.13.34.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 20 Jan 2018 13:34:31 -0800 (PST) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: donb@codesourcery.com, simark@simark.ca, palves@redhat.com, Andrew Burgess Subject: [PATCHv6 1/5] gdb: Remove duplicate declaration of global innermost_block Date: Sat, 20 Jan 2018 21:34:23 +0000 Message-Id: In-Reply-To: References: In-Reply-To: References: X-IsSubscribed: yes The global 'innermost_block' is declared in two header files. Remove one of the declarations, and add an include of the other header into the one source file that could no longer see a declaration of 'innermost_block'. gdb/ChangeLog: * expression.h (innermost_block): Remove declaration. * varobj.c: Add 'parser-defs.h' include. --- gdb/ChangeLog | 5 +++++ gdb/expression.h | 5 ----- gdb/varobj.c | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d2d44725a02..7d7d10661ea 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2017-10-19 Andrew Burgess + + * expression.h (innermost_block): Remove declaration. + * varobj.c: Add 'parser-defs.h' include. + 2018-01-19 Tom Tromey * rust-lang.c (rust_lookup_symbol_nonlocal): Look up qualified diff --git a/gdb/expression.h b/gdb/expression.h index a783ea5fef2..030f2f08e7a 100644 --- a/gdb/expression.h +++ b/gdb/expression.h @@ -111,11 +111,6 @@ extern expression_up parse_exp_1 (const char **, CORE_ADDR pc, attempt completion. */ extern int parse_completion; -/* The innermost context required by the stack and register variables - we've encountered so far. To use this, set it to NULL, then call - parse_, then look at it. */ -extern const struct block *innermost_block; - /* From eval.c */ /* Values of NOSIDE argument to eval_subexp. */ diff --git a/gdb/varobj.c b/gdb/varobj.c index 01dabef37c3..701ef663766 100644 --- a/gdb/varobj.c +++ b/gdb/varobj.c @@ -30,6 +30,7 @@ #include "gdbthread.h" #include "inferior.h" #include "varobj-iter.h" +#include "parser-defs.h" #if HAVE_PYTHON #include "python/python.h"