[v2,2/4] gdb/dap: ignore unused keyword args in step_out
Checks
Context |
Check |
Description |
linaro-tcwg-bot/tcwg_gdb_build--master-aarch64 |
success
|
Testing passed
|
linaro-tcwg-bot/tcwg_gdb_build--master-arm |
success
|
Testing passed
|
linaro-tcwg-bot/tcwg_gdb_check--master-aarch64 |
success
|
Testing passed
|
Commit Message
Some DAP clients may send additional parameters in the stepOut command
(e.g. "granularity") which are not used by GDB, but should nonetheless
be accepted without error.
---
gdb/python/lib/gdb/dap/next.py | 2 +-
gdb/python/lib/gdb/dap/server.py | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
@@ -69,7 +69,7 @@ def step_in(
@request("stepOut")
-def step_out(*, threadId: int, singleThread: bool = False):
+def step_out(*, threadId: int, singleThread: bool = False, **args):
send_gdb(lambda: _handle_thread_step(threadId, singleThread))
send_gdb(ExecutionInvoker("finish", StopKinds.STEP))
@@ -13,6 +13,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+import inspect
import json
import queue
import sys
@@ -165,6 +166,12 @@ def request(name):
def wrap(func):
global _commands
+ code = func.__code__
+ # We don't permit requests to have positional arguments.
+ assert code.co_posonlyargcount == 0
+ assert code.co_argcount == 0
+ # A request must have a **args parameter.
+ assert code.co_flags & inspect.CO_VARKEYWORDS
# All requests must run in the DAP thread.
# Also type-check the calls.
func = in_dap_thread(type_check(func))