From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1726) id 93A5C3858D37; Sun, 3 Apr 2022 16:18:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 93A5C3858D37 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Andrew Burgess To: gdb-cvs@sourceware.org Subject: [binutils-gdb] gdb: small simplification in dwarf2_locexpr_baton_eval X-Act-Checkin: binutils-gdb X-Git-Author: Andrew Burgess X-Git-Refname: refs/heads/master X-Git-Oldrev: 5187219460cd1ba877c555a67adb283c7a2f0d25 X-Git-Newrev: 22480d7c3977df6a111a1c1ab56982372732f4e5 Message-Id: <20220403161843.93A5C3858D37@sourceware.org> Date: Sun, 3 Apr 2022 16:18:43 +0000 (GMT) X-BeenThere: gdb-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Apr 2022 16:18:43 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D22480d7c3977= df6a111a1c1ab56982372732f4e5 commit 22480d7c3977df6a111a1c1ab56982372732f4e5 Author: Andrew Burgess Date: Wed Mar 16 15:32:50 2022 +0000 gdb: small simplification in dwarf2_locexpr_baton_eval =20 While examining the dwarf expression evaluator, I noticed that in dwarf2_locexpr_baton_eval, whenever push_initial_value is true, the addr_stack will never be nullptr. =20 This allows for a small cleanup, replacing an if/then/else with an assertion. =20 There should be no user visible changes after this commit. Diff: --- gdb/dwarf2/loc.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gdb/dwarf2/loc.c b/gdb/dwarf2/loc.c index 73de3112876..634b51ef279 100644 --- a/gdb/dwarf2/loc.c +++ b/gdb/dwarf2/loc.c @@ -1569,11 +1569,13 @@ dwarf2_evaluate_loc_desc (struct type *type, struct= frame_info *frame, CORE_ADDR. FRAME is the frame in which the expression is evaluated. ADDR_STACK is a context (location of a variable) and might be needed to evaluate the location expression. - PUSH_INITIAL_VALUE is true if the address (either from ADDR_STACK, - or the default of 0) should be pushed on the DWARF expression - evaluation stack before evaluating the expression; this is required - by certain forms of DWARF expression. Returns 1 on success, 0 - otherwise. */ + + PUSH_INITIAL_VALUE is true if the first address from ADDR_STACK, should + be pushed on the DWARF expression evaluation stack before evaluating the + expression; this is required by certain forms of DWARF expression. When + PUSH_INITIAL_VALUE is true ADDR_STACK can't be nullptr. + + Returns 1 on success, 0 otherwise. */ =20 static int dwarf2_locexpr_baton_eval (const struct dwarf2_locexpr_baton *dlbaton, @@ -1595,10 +1597,8 @@ dwarf2_locexpr_baton_eval (const struct dwarf2_locex= pr_baton *dlbaton, =20 if (push_initial_value) { - if (addr_stack !=3D nullptr) - ctx.push_address (addr_stack->addr, false); - else - ctx.push_address (0, false); + gdb_assert (addr_stack !=3D nullptr); + ctx.push_address (addr_stack->addr, false); } =20 try