From patchwork Tue Oct 6 16:52:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iain Buclaw X-Patchwork-Id: 8946 Received: (qmail 11138 invoked by alias); 6 Oct 2015 16:52:22 -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 11064 invoked by uid 89); 6 Oct 2015 16:52:21 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.3 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-wi0-f170.google.com Received: from mail-wi0-f170.google.com (HELO mail-wi0-f170.google.com) (209.85.212.170) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Tue, 06 Oct 2015 16:52:19 +0000 Received: by wicfx3 with SMTP id fx3so167902195wic.0 for ; Tue, 06 Oct 2015 09:52:16 -0700 (PDT) MIME-Version: 1.0 X-Received: by 10.180.103.167 with SMTP id fx7mr17507240wib.89.1444150336163; Tue, 06 Oct 2015 09:52:16 -0700 (PDT) Received: by 10.27.83.201 with HTTP; Tue, 6 Oct 2015 09:52:16 -0700 (PDT) Date: Tue, 6 Oct 2015 18:52:16 +0200 Message-ID: Subject: [PING] [PATCH] [D] Re-apply change for handling non-local references in nested functions From: Iain Buclaw To: GDB Patches X-IsSubscribed: yes Another belated ping, again I'll go ahead with it as its trivial/obvious. --- Hi, This was first applied by Pierre-Marie back in February (see 63e43d3aedb8b1112899c2d0ad74cbbee687e5d6), but my re-write of d-exp.y was written about 6 months earlier, and I subsequently missed it when backporting upstream changes. This reapplies that change. Regards Iain gdb/ChangeLog: * d-exp.y: Remove an obsolete comment and propagate the block information to the produced expression. --- diff --git a/gdb/d-exp.y b/gdb/d-exp.y index dd87d8a..b66565d 100644 --- a/gdb/d-exp.y +++ b/gdb/d-exp.y @@ -483,9 +483,7 @@ PrimaryExpression: } write_exp_elt_opcode (pstate, OP_VAR_VALUE); - /* We want to use the selected frame, not another more inner frame - which happens to be in the same block. */ - write_exp_elt_block (pstate, NULL); + write_exp_elt_block (pstate, sym.block); write_exp_elt_sym (pstate, sym.symbol); write_exp_elt_opcode (pstate, OP_VAR_VALUE); }