From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-io1-xd35.google.com (mail-io1-xd35.google.com [IPv6:2607:f8b0:4864:20::d35]) by sourceware.org (Postfix) with ESMTPS id 613EE3858C5E for ; Fri, 14 Apr 2023 19:19:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 613EE3858C5E 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-xd35.google.com with SMTP id be5so2305538iob.12 for ; Fri, 14 Apr 2023 12:19:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1681499956; x=1684091956; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=DU+nATWNr63CmintdtRwf0Oi6iao3rm+Uj/lqBgGdto=; b=XyxTyxcCWDP3N5NpjuUAUtLPEL4Ox6gKzo7qPegwXgbBeMKHbuKu8LTknbeff2h3r1 JTsj/Egg20H4NQFtvd+rA5nuY2j1duaSojXFPWjms9BY5wAAvqwLJ5xu5ONf66po1/gj NMGAn7d3ty13kds1cmZiRuvNx66jyqvg5x1Rv3RVJw3bpFGSpnH3GDtO2hO9R+RVV+0n GsZX4oeIOqWTnY4zkloo9vd4oakZ6jyZCybtGmwNEglwtwxgI6OuGkvlbJhzdm0FBAjF i1Bo1vQKFue8vO9SZLqTChr30eNO62QLzCi2NqP/IdZr5n/LZ9wFa9l8Eak4J4T3JhbW muPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681499956; x=1684091956; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=DU+nATWNr63CmintdtRwf0Oi6iao3rm+Uj/lqBgGdto=; b=NUfl0RkB6PZJ+2Jd/QPymDaSy/3+9qO3F6NbWsENb0itEnR5ezds2WT9xHCFhKUD+r plc3zr/cKWBizvWDAZbitntEWVTsargTevGWYIhu20RkYshoU7KGf14sFkCcbI+isjh0 5YmaIRMfnSidR2lYwbDtGiKImOQkujcvPKM0Dahdvr8Y84mZKDdOp6LTrtEZ6uRUfc5A lc6OlwlmbMIQj96E7XZK4fJJwgKf8N1e49DjO0O9KU4FEfNYT1WZFVgwBthcCtl/xr1x LT2pRf37UoJSoA8jBg2iSBLyFe2EqlGwYx9/FNa1nLkYbk27Q8z2ihbJ6UE/1Re1sNc+ S+sQ== X-Gm-Message-State: AAQBX9cBtgglmjefrw2VfPURE6aAt/IeOTY/t9eoixNTKGDrty76mJfa PnC9ywR8S2y2lfNg9SLz7HjGWUV8kl5xaqFFfyxTgQ== X-Google-Smtp-Source: AKy350aG/ks4qoOjjkBcIpVp4WcChsNfE3udK0HeihlZxleO1szVQa6VwdYhQR/eth46OuTeC2k0aQ== X-Received: by 2002:a05:6602:1cf:b0:760:c072:d276 with SMTP id w15-20020a05660201cf00b00760c072d276mr2854665iot.21.1681499956602; Fri, 14 Apr 2023 12:19:16 -0700 (PDT) Received: from localhost.localdomain (71-211-191-82.hlrn.qwest.net. [71.211.191.82]) by smtp.gmail.com with ESMTPSA id g7-20020a5ec747000000b00746cb6d90c0sm1301338iop.14.2023.04.14.12.19.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Apr 2023 12:19:16 -0700 (PDT) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH] Turn set_inferior_args_vector into method of inferior Date: Fri, 14 Apr 2023 13:19:06 -0600 Message-Id: <20230414191906.480316-1-tromey@adacore.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE 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: This patch turns set_inferior_args_vector into an overload of inferior::set_args. Regression tested on x86-64 Fedora 36. --- gdb/infcmd.c | 8 -------- gdb/inferior.c | 8 ++++++++ gdb/inferior.h | 5 +++-- gdb/main.c | 3 ++- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/gdb/infcmd.c b/gdb/infcmd.c index 103899432f7..2b5815f09e3 100644 --- a/gdb/infcmd.c +++ b/gdb/infcmd.c @@ -128,14 +128,6 @@ show_inferior_tty_command (struct ui_file *file, int from_tty, "is \"%s\".\n"), inferior_tty.c_str ()); } -void -set_inferior_args_vector (int argc, char **argv) -{ - gdb::array_view args (argv, argc); - std::string n = construct_inferior_arguments (args); - current_inferior ()->set_args (std::move (n)); -} - /* Notice when `set args' is run. */ static void diff --git a/gdb/inferior.c b/gdb/inferior.c index 6eb9f3ff23b..4a2baf19c87 100644 --- a/gdb/inferior.c +++ b/gdb/inferior.c @@ -164,6 +164,14 @@ inferior::tty () return m_terminal; } +/* See inferior.h. */ + +void +inferior::set_args (gdb::array_view args) +{ + set_args (construct_inferior_arguments (args)); +} + void inferior::add_continuation (std::function &&cont) { diff --git a/gdb/inferior.h b/gdb/inferior.h index 633916eb7c1..5da7c62473b 100644 --- a/gdb/inferior.h +++ b/gdb/inferior.h @@ -225,8 +225,6 @@ extern void post_create_inferior (int from_tty); extern void attach_command (const char *, int); -extern void set_inferior_args_vector (int, char **); - extern void registers_info (const char *, int); extern void continue_1 (int all_threads); @@ -523,6 +521,9 @@ class inferior : public refcounted_object, m_args = std::move (args); }; + /* Set the argument string from some strings. */ + void set_args (gdb::array_view args); + /* Get the argument string to use when running this inferior. No arguments is represented by an empty string. */ diff --git a/gdb/main.c b/gdb/main.c index 0bf6f98a797..9fb6dceb9ca 100644 --- a/gdb/main.c +++ b/gdb/main.c @@ -1064,7 +1064,8 @@ captured_main_1 (struct captured_main_args *context) symarg = argv[optind]; execarg = argv[optind]; ++optind; - set_inferior_args_vector (argc - optind, &argv[optind]); + current_inferior ()->set_args + (gdb::array_view (&argv[optind], argc - optind)); } else { -- 2.39.1