From: Simon Farre <simon.farre.cx@gmail.com>
Date: Mon, 19 Jun 2023 23:27:28 +0000 (+0200)
Subject: gdb/DAP Few bug fixes & Evaluate Array Watch vars
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=596c507f5ddb6d143f103e371eda8c0008f15254;p=binutils-gdb.git

gdb/DAP Few bug fixes & Evaluate Array Watch vars

v2.

EvaluateResult does not need a name, just as what Tom pointed out in
previous review. It's only the *children* that need to be made sure that
their names are valid. An identifier for a variable, can't ever have an
integer as a name, anyhow (not as far as I am aware, no programming
languages allow for that).

Removed the f-strings and use str() instead as pointed out that
f-strings might not be supported fully.

v1.

This patch fixes a few bugs.

First of all, name of VariableReferences must always be of string type.
This patch makes sure that this is the case by formatting the name. If
(when) the name is an integer, this will cause clients to fail or throw
errors.

Fixes a bug in NoOpArrayPrinter that calculated children to be N, but
only ever retrieves N-1 children, which makes Python at some time later
(during fetch_children -> fetch_one_child(N) ) raise an exception (out
of list index) which makes the entire request go bad.

The result[self.result_name] also f-strings the printer.to_string()
value, because this can potentially be a LazyString (which is a Python
object, not a string) and is not serializable by json.dumps.

Approved-By: Tom Tromey <tom@tromey.com>
---

diff --git a/gdb/python/lib/gdb/dap/varref.py b/gdb/python/lib/gdb/dap/varref.py
index 23f18d647c3..213151fd3d3 100644
--- a/gdb/python/lib/gdb/dap/varref.py
+++ b/gdb/python/lib/gdb/dap/varref.py
@@ -66,7 +66,7 @@ class BaseReference:
             "variablesReference": self.ref,
         }
         if self.name is not None:
-            result["name"] = self.name
+            result["name"] = str(self.name)
         return result
 
     def no_children(self):
diff --git a/gdb/python/lib/gdb/printing.py b/gdb/python/lib/gdb/printing.py
index ab62ef3e45c..353427d000a 100644
--- a/gdb/python/lib/gdb/printing.py
+++ b/gdb/python/lib/gdb/printing.py
@@ -298,7 +298,7 @@ class NoOpArrayPrinter:
         return "array"
 
     def children(self):
-        for i in range(self.low, self.high):
+        for i in range(self.low, self.high + 1):
             yield (i, self.value[i])