From patchwork Thu Nov 14 19:00:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Simon Marchi (Code Review)" X-Patchwork-Id: 35893 Received: (qmail 15759 invoked by alias); 14 Nov 2019 19:00:41 -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 15517 invoked by uid 89); 14 Nov 2019 19:00:24 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.3 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3 autolearn=ham version=3.3.1 spammy= X-HELO: mx1.osci.io Received: from polly.osci.io (HELO mx1.osci.io) (8.43.85.229) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 14 Nov 2019 19:00:13 +0000 Received: by mx1.osci.io (Postfix, from userid 994) id 8912D203AF; Thu, 14 Nov 2019 14:00:08 -0500 (EST) Received: from gnutoolchain-gerrit.osci.io (gnutoolchain-gerrit.osci.io [8.43.85.239]) by mx1.osci.io (Postfix) with ESMTP id 0FB8A20307; Thu, 14 Nov 2019 14:00:07 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by gnutoolchain-gerrit.osci.io (Postfix) with ESMTP id D522320AF6; Thu, 14 Nov 2019 14:00:06 -0500 (EST) X-Gerrit-PatchSet: 3 Date: Thu, 14 Nov 2019 14:00:06 -0500 From: "Sourceware to Gerrit sync (Code Review)" To: Tom Tromey , gdb-patches@sourceware.org Auto-Submitted: auto-generated X-Gerrit-MessageType: newpatchset Subject: [pushed] Allow re-assigning to convenience variables X-Gerrit-Change-Id: I5e66a2d243931a5c43c7af4bc9f6717464c2477e X-Gerrit-Change-Number: 628 X-Gerrit-ChangeURL: X-Gerrit-Commit: 55708e99aca33f2ee9036732d778cd5899d2a2b0 In-Reply-To: References: Reply-To: noreply@gnutoolchain-gerrit.osci.io, tromey@sourceware.org, gdb-patches@sourceware.org MIME-Version: 1.0 Content-Disposition: inline User-Agent: Gerrit/3.0.3-76-gf8b6da0ab5 Message-Id: <20191114190006.D522320AF6@gnutoolchain-gerrit.osci.io> The original change was created by Tom Tromey. Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/628 ...................................................................... Allow re-assigning to convenience variables A customer reported somewhat odd gdb behavior, where re-assigning an array or string to a convenience variable would yield "Too many array elements". A test case is: (gdb) p $x = "x" (gdb) p $x = "xyz" This patch fixes the problem by making a special case in the evaluator for assignment to convenience variables, which seems like the correct behavior. Note that a previous patch implemented this for Ada, see commit f411722cb ("Allow re-assigning to convenience variables"). gdb/ChangeLog 2019-11-14 Tom Tromey * eval.c (evaluate_subexp_standard) : Do not pass an expected type for the RHS if the LHS is a convenience variable. gdb/testsuite/ChangeLog 2019-11-14 Tom Tromey * gdb.base/gdbvars.exp (test_convenience_variables): Add regression tests. Change-Id: I5e66a2d243931a5c43c7af4bc9f6717464c2477e --- M gdb/ChangeLog M gdb/eval.c M gdb/testsuite/ChangeLog M gdb/testsuite/gdb.base/gdbvars.exp 4 files changed, 33 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 719574f..1a84242 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2019-11-14 Tom Tromey + + * eval.c (evaluate_subexp_standard) : Do not pass an + expected type for the RHS if the LHS is a convenience variable. + 2019-11-14 Simon Marchi * unittests/vec-utils-selftests.c (unordered_remove_tests::obj): diff --git a/gdb/eval.c b/gdb/eval.c index 139fd68..71e79d6 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -2151,7 +2151,14 @@ case BINOP_ASSIGN: arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside); - arg2 = evaluate_subexp (value_type (arg1), exp, pos, noside); + /* Special-case assignments where the left-hand-side is a + convenience variable -- in these, don't bother setting an + expected type. This avoids a weird case where re-assigning a + string or array to an internal variable could error with "Too + many array elements". */ + arg2 = evaluate_subexp (VALUE_LVAL (arg1) == lval_internalvar + ? NULL_TYPE : value_type (arg1), + exp, pos, noside); if (noside == EVAL_SKIP || noside == EVAL_AVOID_SIDE_EFFECTS) return arg1; diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 7416b82..3a4d229 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-11-14 Tom Tromey + + * gdb.base/gdbvars.exp (test_convenience_variables): Add + regression tests. + 2019-11-12 Tom Tromey * lib/tuiterm.exp (_accept): Add wait_for parameter. Check output diff --git a/gdb/testsuite/gdb.base/gdbvars.exp b/gdb/testsuite/gdb.base/gdbvars.exp index 8259115..a4e5b41 100644 --- a/gdb/testsuite/gdb.base/gdbvars.exp +++ b/gdb/testsuite/gdb.base/gdbvars.exp @@ -51,6 +51,21 @@ gdb_test "print \$bar" " = void" \ "Print contents of uninitialized convenience variable" + + + gdb_test "print \$str = \"some string\"" \ + " = \"some string\"" \ + "Set convenience variable to string value" + gdb_test "print \$str = \"some other string\"" \ + " = \"some other string\"" \ + "Change convenience variable to different string value" + + gdb_test "print \$arr = {1, 2, 3}" \ + " = \\{1, 2, 3\\}" \ + "Set convenience variable to array value" + gdb_test "print \$arr = {0, 1, 2, 3}" \ + " = \\{0, 1, 2, 3\\}" \ + "Set convenience variable to different array value" } proc test_convenience_functions {} {