From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-io1-xd32.google.com (mail-io1-xd32.google.com [IPv6:2607:f8b0:4864:20::d32]) by sourceware.org (Postfix) with ESMTPS id 1028A3858D37 for ; Fri, 1 Sep 2023 14:47:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1028A3858D37 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com Received: by mail-io1-xd32.google.com with SMTP id ca18e2360f4ac-7927f24140eso73853139f.2 for ; Fri, 01 Sep 2023 07:47:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1693579633; x=1694184433; darn=sourceware.org; h=to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=9W1b6yooWhUlHy4t5EtkGn7sWq1zd0Grz/W2cY74v58=; b=Hs4EXes0fDSn6lAcJtATzv9vps26VTxUS7xd+fvE7PZDFLxc30sivA71CzyW/RphME GP0Boaxcgfrh9fHV801/wKN1r7LDVpxhRwKFbipCTx2GRGffbmeNiKMsMFFvJEjebULM HaPJvmh6HNbHN8j1XuYcFmsY79ZcAc6buNaebeCdPwWAuxnzpzt8UzzTSYTVL8YCrI1+ 95Y56jrAO1xSLwCapJp3MCs0iSg3MhyN8DZ8R7DzrBPu3v5eeho5/0uEmBbvYbgWK/uM 39giFaJtywDH2uAB2iYE/DisBpWu4ct12YIW1WJJh0HezgQAQhgvTc1LqmGqe+f6ytMd 5Cdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693579633; x=1694184433; h=to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9W1b6yooWhUlHy4t5EtkGn7sWq1zd0Grz/W2cY74v58=; b=g2nCvOnXLBzavG7tyAnn0kLK/M6PK3Q4IcDIGBZp6EVh0Jx4+8YyqNqXnP1BCahB0O 4Is16El/gB7ubEXB1SrEDErE05oWCNDgEgAjzJBUqqHBnnR1hs1rc7nFqzIHPc9yXwEj 8xe9uowWbXMtexnQNdYW48r93JbdwP0umNXYIsf2mA9W8i0OQN5A8dmxZg2f6xMFk7tM ake23eghgL8rIoWEfWAateQT2Nv+VEcsmtEgKie/mBXBaKkjLQpNUzH73J0+AbTz1DEg oulY45eXL2vpP0woqST8JtVKg+z/Qa0ATJviWDlK1YoSZk8U8zu8METmz1OPeBZ7uiFu gkUQ== X-Gm-Message-State: AOJu0Yyrb6gYdX8zv2hK6R4K/j25FUbkc6ILebyalEYLxcNk7JL3MJ/F 3826GnhMk0GQPoDasHWETrF6t7HGukrCkCWMpHS24Q== X-Google-Smtp-Source: AGHT+IEM7A+/kXdLZDOmu9ZOheEf77IYtitK1FGda5r6xxVvY8IW6R5bBGlKpFyF2idLEPrmzMJHoA== X-Received: by 2002:a5d:9d15:0:b0:794:da97:d194 with SMTP id j21-20020a5d9d15000000b00794da97d194mr3061089ioj.19.1693579633312; Fri, 01 Sep 2023 07:47:13 -0700 (PDT) Received: from localhost.localdomain (75-166-150-212.hlrn.qwest.net. [75.166.150.212]) by smtp.gmail.com with ESMTPSA id q1-20020a0566380ec100b0042b1a9f8480sm1036710jas.35.2023.09.01.07.47.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Sep 2023 07:47:12 -0700 (PDT) From: Tom Tromey Date: Fri, 01 Sep 2023 08:47:11 -0600 Subject: [PATCH 1/4] Allow pretty-printer 'children' method to return strings MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20230901-varobj-fixes-v1-1-b9a1f8139ca7@adacore.com> References: <20230901-varobj-fixes-v1-0-b9a1f8139ca7@adacore.com> In-Reply-To: <20230901-varobj-fixes-v1-0-b9a1f8139ca7@adacore.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.3 X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: A user noticed that, while a pretty-printer can return Python strings from its "children" method, this does not really work for MI. I tracked this down to my_value_of_variable calling into c_value_of_variable, which specially handles arrays and structures -- not using the actual contents of the string. Now, this part of MI seems bad to me, but rather than change that, this applies the fix to only dynamic varobjs, which is the only scenario where a string like this can really be returned. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=18282 --- gdb/testsuite/gdb.python/py-varobj.c | 26 ++++++++++++++++++ gdb/testsuite/gdb.python/py-varobj.exp | 49 ++++++++++++++++++++++++++++++++++ gdb/testsuite/gdb.python/py-varobj.py | 35 ++++++++++++++++++++++++ gdb/varobj.c | 3 +++ 4 files changed, 113 insertions(+) diff --git a/gdb/testsuite/gdb.python/py-varobj.c b/gdb/testsuite/gdb.python/py-varobj.c new file mode 100644 index 00000000000..894ce8fca06 --- /dev/null +++ b/gdb/testsuite/gdb.python/py-varobj.c @@ -0,0 +1,26 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2023 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +struct test { + int x; +}; + +struct test tval = {23}; + +int main () { + return 0; +} diff --git a/gdb/testsuite/gdb.python/py-varobj.exp b/gdb/testsuite/gdb.python/py-varobj.exp new file mode 100644 index 00000000000..0e0978352a5 --- /dev/null +++ b/gdb/testsuite/gdb.python/py-varobj.exp @@ -0,0 +1,49 @@ +# Copyright (C) 2023 Free Software Foundation, Inc. +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Some varobj tests involving pretty-printers + +load_lib mi-support.exp +set MIFLAGS "-i=mi" + +require allow_python_tests + +standard_testfile + +if {[gdb_compile "$srcdir/$subdir/$srcfile" $binfile executable {debug}] != ""} { + return -1 +} + +mi_clean_restart $binfile + +set pyfile [gdb_remote_download host ${srcdir}/${subdir}/${testfile}.py] +mi_gdb_test "source ${pyfile}" \ + ".*\\^done" \ + "load python file" + +mi_gdb_test "-enable-pretty-printing" \ + "\\^done" \ + "-enable-pretty-printing" + +mi_gdb_test "set python print-stack full" \ + ".*\\^done" \ + "set python print-stack full" + +mi_runto_main + +mi_gdb_test "-var-create tval * tval" \ + "\\^done.*" + +mi_gdb_test "-var-list-children --all-values tval" \ + ".*value=.*flicker.*" diff --git a/gdb/testsuite/gdb.python/py-varobj.py b/gdb/testsuite/gdb.python/py-varobj.py new file mode 100644 index 00000000000..bc31a198297 --- /dev/null +++ b/gdb/testsuite/gdb.python/py-varobj.py @@ -0,0 +1,35 @@ +# Copyright (C) 2023 Free Software Foundation, Inc. +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +import gdb.printing + + +class TestPrinter: + def __init__(self, val): + self.val = val + + def to_string(self): + return "map" + + def children(self): + yield "1", "flicker" + + +def str_lookup_function(val): + lookup_tag = val.type.tag + if lookup_tag == "test": + return TestPrinter(val) + + +gdb.printing.register_pretty_printer(None, str_lookup_function) diff --git a/gdb/varobj.c b/gdb/varobj.c index e7323bed127..52e62aca265 100644 --- a/gdb/varobj.c +++ b/gdb/varobj.c @@ -2117,6 +2117,9 @@ my_value_of_variable (struct varobj *var, enum varobj_display_formats format) if (var->dynamic->pretty_printer != NULL) return varobj_value_get_print_value (var->value.get (), var->format, var); + else if (var->parent != nullptr && varobj_is_dynamic_p (var->parent)) + return var->print_value; + return (*var->root->lang_ops->value_of_variable) (var, format); } else -- 2.40.1