From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by sourceware.org (Postfix) with ESMTPS id 95B2C3858C5E for ; Fri, 3 Mar 2023 07:47:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 95B2C3858C5E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1677829679; x=1709365679; h=from:to:subject:date:message-id:references:in-reply-to: mime-version:content-transfer-encoding; bh=V7kB+q9xkxFIhgg7B3Er9MHD6L4qWJvaC7KFmqDku8o=; b=k6Ccoh6ML43ggyu3GiOUv1hjnP09yZRpA1EnVLY6yBlatQwR2yHyGfhF lurdMYYNNZgJWbpREz6HDyiT7C+91Ao9+zZnA+s7Whcsz/kD7GhnmkuGx DCL78VbW/EKTiBcmLUGUCiTCCKJ+ZUNn/GLUrdWztO0/IJS8HvGzWxMtD B2HE05+lyQAJ7AYoXLmvYm+aDgVWux4ToCgO+/ufCgFWGmtT/XqhbE7Mx Btp5Sve0JXN3FqJn+uI5/Ogc2kZPdv2AqEzUGjBtEpojiW7kyhbo/wzjG Im9NDbhMH+TX29ZlGQR6vDoItoCsLwTsG/Y/n0j0bUHC7W1ZfRvRUh1au g==; X-IronPort-AV: E=McAfee;i="6500,9779,10637"; a="314640766" X-IronPort-AV: E=Sophos;i="5.98,229,1673942400"; d="scan'208";a="314640766" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Mar 2023 23:47:58 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10637"; a="675270226" X-IronPort-AV: E=Sophos;i="5.98,230,1673942400"; d="scan'208";a="675270226" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by orsmga002.jf.intel.com with ESMTP; 02 Mar 2023 23:47:58 -0800 Received: from orsmsx611.amr.corp.intel.com (10.22.229.24) by ORSMSX603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21; Thu, 2 Mar 2023 23:47:57 -0800 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx611.amr.corp.intel.com (10.22.229.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21 via Frontend Transport; Thu, 2 Mar 2023 23:47:57 -0800 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (104.47.66.44) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.21; Thu, 2 Mar 2023 23:47:57 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iakr5uP341xqPSTNnZ5Bow4KU19AhEwbfIvUq2GL5a55b+5VbBHQk0QKLZcHLqVQNHVXvc0AVTP3NM0ox/N51/Amik6OxZFSh7sU3+MflagH1UtNmfI4XhxknFu/g1kotVyXjL1YQ7HrmTxZKm/IAz0SLZT4tyTOeiVtEfTF0m70qCCT0Wwcp8KMYSMvxRfl2r7lT4NfvicpxE6wwq9HgTbfCX9bPrhLdBu+zaJKq/WIYPXxDjlIzfTWLhOjTgDRpRl2fo5UNiSu/2m44puiM3Cn62rt/S6N1xHQtDFJfxz7fBPsi8RtiX1V7in0RY/XMkldFDs6MTgyRrzlwVmeKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=jBzFP+jOMvEy0y9FSPu1P6wjm/t2v22oEk/4ireH+Qc=; b=WlIBCPczqDpphQeHe2G1LH60DHaKwB6lBNgCfqLmn1BoM2BnpxYaaatK7R2N251gGzcYofDsxFNAnmx1dU6uqVd3l1Vjfb/kl6mocD3vroTDKAmH5xLBEGHwe5bOncKsWVuDQCjUmi/LJDF2gLowi6cb7BHZtD2AF2uefNAexkEk7voBBMxJ/c+5D5vvWiT50C2xYtjz9rNRurmsq2sCIGSjEKe3BEPQKUvvuXyB90G97WT0w5gblmcsSGiJOD/doGE+A12+bDlRal6cU27BEhu4tQyysbCzuamiTT8uCmMqgWhfIsPma2/0Fau095MXW611OqwAumN900iJ5tclhw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from DM4PR11MB7303.namprd11.prod.outlook.com (2603:10b6:8:108::21) by SA1PR11MB6661.namprd11.prod.outlook.com (2603:10b6:806:255::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.18; Fri, 3 Mar 2023 07:47:55 +0000 Received: from DM4PR11MB7303.namprd11.prod.outlook.com ([fe80::dec6:d57d:f767:c5f2]) by DM4PR11MB7303.namprd11.prod.outlook.com ([fe80::dec6:d57d:f767:c5f2%5]) with mapi id 15.20.6156.017; Fri, 3 Mar 2023 07:47:55 +0000 From: "Aktemur, Tankut Baris" To: "gdb-patches@sourceware.org" Subject: RE: [PATCH] gdb/infrun: reset thread control's step info in end_stepping_range Thread-Topic: [PATCH] gdb/infrun: reset thread control's step info in end_stepping_range Thread-Index: AQHY+e0yhid2YvAG6kuGZgxFBGgoQ67pVOsA Date: Fri, 3 Mar 2023 07:47:55 +0000 Message-ID: References: <20221116185624.3770349-1-tankut.baris.aktemur@intel.com> In-Reply-To: <20221116185624.3770349-1-tankut.baris.aktemur@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: DM4PR11MB7303:EE_|SA1PR11MB6661:EE_ x-ms-office365-filtering-correlation-id: 5194331e-ca6a-41bd-5cab-08db1bbb99d6 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: suDwznVkduCSl++Pr3ctSUg8rpkkWCRXe5p7rfYOc/wK+1HU+g+3INqjTgD13h3QbQmF/bFWPBC3XbMV+y/clIRFEFqm+j4adgVNvrLeF5ndOfpwQULyeoJZrRbcWuifWkZqbRNhbjY0YK8qJMaIb8tVVfevmsm3CpJGrkSBG8CjXKnLlc/y6t/8dxfh2193vGio8nsGvOIWuzwWcFFB9nDWthDdKTPatQRNKOEJvHNRF5mO7w1kvXSbiiHdldZmomjMcrjR1DvgaZfZTUwhi7xUYJ0arf+YL5YMHHDxKv/F2h6Dqki3XhQE1D50IXv0ft0d3i3m0jSxY7lMYlZzPR4qmPgnD9wlCo5XplhBltQqzAgHIyT150xL6blNdw4ztp981YzRhOhkn71bgQb2Yf87xu8539rP22RbVxTx0ONahzWHE5Dv6YCG6stlc5b98CXsDrU02axVIobSFEn4kc15ddO22d81JMR8z4F9grrMmLsMYlwjIgnmO61IUPTyq9pNm42LiAWVgl0HpL5W0a7F902KYaUdYPdJE26Zrc93buIlW4JXEvAxaOAecVEa4Lk81SwZquAa24jf+DLrnzxTB8u9rfrWSMW/9DbR/9KtGHqEzZIM7wxHyyoG31cFsBAX9fTLVstIsKgFJ7ZYFQfEwGbTK+vnKteHZ0igj0bYjVtIktdwVD5ehH1RAmiD1dhtBLtfgY/GOnMddLi8Vg== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM4PR11MB7303.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(346002)(39860400002)(366004)(376002)(136003)(396003)(451199018)(5660300002)(30864003)(122000001)(8936002)(52536014)(6916009)(41300700001)(83380400001)(316002)(66946007)(2906002)(8676002)(55016003)(66556008)(33656002)(66476007)(66446008)(76116006)(64756008)(38100700002)(26005)(6506007)(82960400001)(71200400001)(86362001)(53546011)(7696005)(9686003)(186003)(478600001)(38070700005)(2004002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?v+nT16RgT3sOntvNOTmK0Mt65bC5SUXW9Q7gbN3U9UJcW2PfzuNaLie3RMrV?= =?us-ascii?Q?ZVhqIoPLDccJDHOAUJNp4RLhk314j4OIxjNf8PH/4/xhTGNSds/wG7C+8tiS?= =?us-ascii?Q?dl/SxkCijuhYnaYNkmsMoC5x3Dg4cEvlp3JKMvgHzvYbfkmmz0bU10DD3RRx?= =?us-ascii?Q?LaujlIXsDM0kFVUr0q3jm9XPenCCIodcxv4l6ksVIAAjCwBnN9QQYXa29h6g?= =?us-ascii?Q?t49Fx/JKTNV2o5kIkngmzqIaEUOjC+caHKO23XkxdTarfG328LdTe8vHYmJG?= =?us-ascii?Q?MUgtpoWlXUxvvIeIS8Bryrdpjt4KUwClKghdDBVPmOShItVaGUtdw7CoPfHr?= =?us-ascii?Q?ZzIwQ3yRtX6RH8hfh91c3MEV1athkYfjGKmYDNQ41lOU+2H6d/It27LBNJr8?= =?us-ascii?Q?RjdTlntHwTXzsmHr2bYTWumNEuNT8KGHOJiH+COM218RrP9Lr9UEF3VKjB9A?= =?us-ascii?Q?noDctbpZQppxaK3vfMB+k8MnGIenxYJixfvRWw2jQuWIm1uyN1XWSgQcS3ww?= =?us-ascii?Q?mT+CXk32ALKXqjrZvmTvTLKu7JUg2X3Ci2Swt84SnfGYmCXi0LzgzGtM8Ji1?= =?us-ascii?Q?/nh5tFM0ZKYpstAd8wAIFfqtwBADVEl9+O3a1/dCJp1acI359rz7L8a7j4X4?= =?us-ascii?Q?5ZBHajvjdcET9LwndZkCFtEWHu5lq5/+8K67IzcSeo8tC+IEeGNNX8tLykCf?= =?us-ascii?Q?MgJ4MVzMiQVyQxTZutfd/fS6XLRTzdnirbMLs8TGD/vq1RZlOFiHN1M7yfjy?= =?us-ascii?Q?Q14kZ/CY50jRtVs0BssyYym4MwsTDLEST/dT0Z7h+NoXNOju2Rqt4SDLvFEW?= =?us-ascii?Q?rKaUIrTwmuYJaN6jGaczK/qC35FZQW91RiCBIKu81oZURxR3ecjbj1eQi3ez?= =?us-ascii?Q?WOyzn+p9REYgbc0Ew5ZRNa6GHgO4+YltnPezc1rWBDdt5luOm91I3Mm/b8AB?= =?us-ascii?Q?0Hyf67PCQ/a4uRyrtfkCltBh4BXQRIvs2oUy0sMR2X2B4IEdXFeR3sjL8bt3?= =?us-ascii?Q?1AfRPaI5RFSuJ5uKDCHMt4OFZEKLG/yVLvwfnd4Ht6msA1JKdKuUZsvT6B3E?= =?us-ascii?Q?BvV9BpevANnLfM2KhCxr8yqmyIGoT0vTlYve/VhlORO2DQNDHRegF4Ip4iKS?= =?us-ascii?Q?wlA23VSBUHeIsMyzjh4qtl+aBWYKelB+vgZrJ1Q4O9w8ngYMJKxG5yEBL99B?= =?us-ascii?Q?OEyItbQp6piR9WzHRJ4zqYM/pFW/NuH7Leo0642pr+/DwsTHOGxn9cnE3ZjE?= =?us-ascii?Q?XJCd26BekR+xoMHqnRRXN5z/4Afd2YGbS+hNaomt0jYNqKcHn1UzXZjKny5S?= =?us-ascii?Q?OWBKEuYAyW41aND2Nf0jNZ2hNwEYXJvgb/DU0WtHTRMwFJ7jOLzZBMR2DYyY?= =?us-ascii?Q?VjFrvaUd1s9wBXdR6E65jk/IBnNeom47OhcmBuRYUbEDaF1MjmMkI5uV3c0O?= =?us-ascii?Q?9HFYcGuWhPHtyfaMxSfkpYMHQe6DyTP4dzOOKdL3Ili98Ef/e1wiQhPlQn8p?= =?us-ascii?Q?M5crR00gdPDVlKzJ8CQjMVSETjWaH3bcXLRFxONoO+WKphoD4Pwp52GjfX9u?= =?us-ascii?Q?U+l+YtC36q1nJp4be7joEbdrG29R4B+YjUZuEZN5rwgahb85QRfFFwJEMXE4?= =?us-ascii?Q?+w=3D=3D?= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB7303.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5194331e-ca6a-41bd-5cab-08db1bbb99d6 X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Mar 2023 07:47:55.6228 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 5H2A//rQg47uqboJ0N3Vo7dIJoLs9ZNpO5EEOjKh0cVBI1AzWBElMOKcAxaFo/DKNYYOTGavWHfwT2CRrbm44Pp1o9n8fx1RExo7JzFmSlA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR11MB6661 X-OriginatorOrg: intel.com Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,SPF_HELO_PASS,SPF_NONE,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: Kindly pinging. Thanks -Baris On Wednesday, November 16, 2022 7:56 PM, Aktemur, Tankut Baris wrote: > Suppose we have two inferiors on an all-stop target with schedule-multi > set on: > = > $ gdb -q > (gdb) target extended-remote | gdbserver --multi - > Remote debugging using | gdbserver --multi - > Remote debugging using stdio > (gdb) file /temp/test > Reading symbols from /temp/test... > (gdb) set remote exec-file /temp/test > (gdb) start > Temporary breakpoint 1 at 0x115c: file test.c, line 8. > Starting program: /temp/test > stdin/stdout redirected > Process /temp/test created; pid =3D 864027 > ... > = > Temporary breakpoint 1, main (argc=3D1, argv=3D0x7fffffffd218) at test.= c:8 > 8 foo(); > (gdb) add-inferior > [New inferior 2] > Added inferior 2 on connection 1 (extended-remote | gdbserver --multi -) > (gdb) inferior 2 > [Switching to inferior 2 [] ()] > (gdb) file /temp/test > Reading symbols from /temp/test... > (gdb) set remote exec-file /temp/test > (gdb) tbreak 2 > Temporary breakpoint 2 at 0x555555555131: /temp/test.c:2. (2 locations) > (gdb) run > Starting program: /temp/test > stdin/stdout redirected > Process /temp/test created; pid =3D 864430 > ... > = > Thread 2.1 "test" hit Temporary breakpoint 2, foo () at test.c:2 > 2 int a =3D 42; > (gdb) set schedule-multi on > (gdb) > = > At this point, detaching the first inferior works fine: > = > (gdb) detach inferiors 1 > Detaching from program: /temp/test, process 858904 > Detaching from process 858904 > [Inferior 1 (process 858904) detached] > (gdb) info inferiors > Num Description Connection Exec= utable > 1 1 (extended-remote | gdbserver --multi -) /tem= p/test > * 2 process 858925 1 (extended-remote | gdbserver --multi -) /tem= p/test > (gdb) > = > Let us now repeat exactly the same scenario, but before detaching, we > make the current thread single-step an instruction: > = > ... > Thread 2.1 "test" hit Temporary breakpoint 2, foo () at test.c:2 > 2 int a =3D 42; > (gdb) stepi > 3 int b =3D 43; > (gdb) detach inferiors 1 > Detaching from program: /temp/test, process 876580 > Detaching from process 876580 > gdbserver: Couldn't reap LWP 876580 while detaching: No child processes > [Inferior 1 (process 876580) detached] > (gdb) 3 int b =3D 43; > = > There is a mysterious line info output. Running the scenario with > infrun debug logs reveals more information. > = > ... > Thread 2.1 "test" hit Temporary breakpoint 2, foo () at test.c:2 > 2 int a =3D 42; > (gdb) stepi > 3 int b =3D 43; > (gdb) set debug infrun on > (gdb) detach inferiors 1 > [infrun] scoped_disable_commit_resumed: reason=3Ddetaching > Detaching from program: /temp/test, process 872445 > Detaching from process 872445 > gdbserver: Couldn't reap LWP 872445 while detaching: No child processes > [Inferior 1 (process 872445) detached] > [infrun] start_step_over: enter > [infrun] start_step_over: stealing global queue of threads to step, l= ength =3D 0 > [infrun] operator(): step-over queue now empty > [infrun] start_step_over: exit > [infrun] restart_stepped_thread: switching back to stepped thread (step= ping) > [infrun] keep_going_stepped_thread: resuming previously stepped thread > [infrun] keep_going_stepped_thread: expected thread advanced also (0x55= 5555555131 -> > 0x555555555138) > [infrun] clear_step_over_info: clearing step over info > [infrun] do_target_resume: resume_ptid=3D-1.0.0, step=3D0, sig=3DGDB_SI= GNAL_0 > [infrun] infrun_async: enable=3D1 > [infrun] reset: reason=3Ddetaching > [infrun] maybe_set_commit_resumed_all_targets: enabling commit-resumed = for target > extended-remote > [infrun] maybe_call_commit_resumed_all_targets: calling commit_resumed = for target > extended-remote > (gdb) [infrun] fetch_inferior_event: enter > [infrun] scoped_disable_commit_resumed: reason=3Dhandling event > [infrun] do_target_wait: Found 2 inferiors, starting at #0 > [infrun] random_pending_event_thread: None found. > [infrun] print_target_wait_results: target_wait (-1.0.0 [process -1],= status) =3D > [infrun] print_target_wait_results: 872464.872464.0 [Thread 872464.= 872464], > [infrun] print_target_wait_results: status->kind =3D STOPPED, sig = =3D GDB_SIGNAL_TRAP > [infrun] handle_inferior_event: status->kind =3D STOPPED, sig =3D GDB= _SIGNAL_TRAP > [infrun] context_switch: Switching context from 0.0.0 to 872464.87246= 4.0 > [infrun] handle_signal_stop: stop_pc=3D0x555555555138 > [infrun] handle_signal_stop: [872464.872464.0] hit its single-step br= eakpoint > [infrun] handle_signal_stop: delayed software breakpoint trap, ignori= ng > [infrun] process_event_stop_test: stepi/nexti > [infrun] stop_waiting: stop_waiting > 3 int b =3D 43; > [infrun] infrun_async: enable=3D0 > [infrun] reset: reason=3Dhandling event > [infrun] maybe_set_commit_resumed_all_targets: not requesting commit-= resumed for target > extended-remote, no resumed threads > [infrun] fetch_inferior_event: exit > = > GDB attempted to do a step-over for the current thread. This takes us > to the commit that introduced restarting step-overs: > = > commit 408f66864a1a823591b26420410c982174c239a2 > Author: Pedro Alves > Date: Mon Jan 11 20:01:58 2021 +0000 > = > detach in all-stop with threads running > = > A following patch will add a testcase that has a number of threads > constantly stepping over a breakpoint, and then has GDB detach the > process, while threads are running. If we have more than one inferior > running, and we detach from just one of the inferiors, we expect that > the remaining inferior continues running. However, in all-stop, if > GDB needs to pause the target for the detach, nothing is re-resuming > the other inferiors after the detach. "info threads" shows the > threads as running, but they really aren't. This fixes it. > = > However, the thread that was resumed for step-over in our scenario did > not have an interrupted step-over; it had completed its stepi already. > More debugging reveals that the thread is resumed because of the > following two conditions in `restart_stepped_thread`: > = > if (tp->control.trap_expected) > { > infrun_debug_printf ("switching back to stepped thread (step-ov= er)"); > = > if (keep_going_stepped_thread (tp)) > return true; > } > = > and > = > if (tp->control.step_range_end) > { > infrun_debug_printf ("switching back to stepped thread (steppin= g)"); > = > if (keep_going_stepped_thread (tp)) > return true; > } > = > The root cause of the problem is, the 'trap_expected' and the > 'step_range_end' fields of the thread's control remain set even after > the "stepi" command completes. We fix the problem by clearing the > control fields when stepping completes. We also add a regression test. > = > Regression-tested using the default, native-gdbserver, and > native-extended-gdbserver board files. > --- > gdb/infrun.c | 3 ++ > gdb/testsuite/gdb.multi/detach-stepi.c | 30 +++++++++++ > gdb/testsuite/gdb.multi/detach-stepi.exp | 66 ++++++++++++++++++++++++ > 3 files changed, 99 insertions(+) > create mode 100644 gdb/testsuite/gdb.multi/detach-stepi.c > create mode 100644 gdb/testsuite/gdb.multi/detach-stepi.exp > = > diff --git a/gdb/infrun.c b/gdb/infrun.c > index 6da46b75ac7..ef422f0e9e9 100644 > --- a/gdb/infrun.c > +++ b/gdb/infrun.c > @@ -8314,6 +8314,9 @@ static void > end_stepping_range (struct execution_control_state *ecs) > { > ecs->event_thread->control.stop_step =3D 1; > + ecs->event_thread->control.trap_expected =3D 0; > + ecs->event_thread->control.step_range_start =3D 0; > + ecs->event_thread->control.step_range_end =3D 0; > stop_waiting (ecs); > } > = > diff --git a/gdb/testsuite/gdb.multi/detach-stepi.c b/gdb/testsuite/gdb.m= ulti/detach-stepi.c > new file mode 100644 > index 00000000000..d365645fb3f > --- /dev/null > +++ b/gdb/testsuite/gdb.multi/detach-stepi.c > @@ -0,0 +1,30 @@ > +/* This testcase is part of GDB, the GNU debugger. > + > + Copyright 2022 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 .= */ > + > +void > +a_function () > +{ > + int a =3D 42; > +} > + > +int > +main () > +{ > + int b =3D 43; > + a_function (); > + return 0; > +} > diff --git a/gdb/testsuite/gdb.multi/detach-stepi.exp b/gdb/testsuite/gdb= .multi/detach- > stepi.exp > new file mode 100644 > index 00000000000..28ef8c4f9f7 > --- /dev/null > +++ b/gdb/testsuite/gdb.multi/detach-stepi.exp > @@ -0,0 +1,66 @@ > +# This testcase is part of GDB, the GNU debugger. > + > +# Copyright 2022 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 . > + > +# Test detaching from an inferior after a thread in another inferior > +# completes a stepi. This is a regression test for a bug that was > +# causing an inadvertent resume of the just-stepped thread. > + > +standard_testfile > + > +if {[use_gdb_stub]} { > + untested "using gdb stub" > + return 0 > +} > + > +if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} { > + return -1 > +} > + > +if {![runto_main]} { > + return -1 > +} > + > +delete_breakpoints > + > +# Setup inferior 2. > +gdb_test "add-inferior" "Added inferior .*" \ > + "add empty inferior" > +gdb_test "inferior 2" "Switching to inferior .*" \ > + "switch to inferior" > + > +gdb_load $binfile > +runto "a_function" > +gdb_test "info inferiors" > + > +# The bug for which this regression test is written appears in > +# schedule-multi mode. > +gdb_test_no_output "set schedule-multiple on" > + > +# Single-step the thread in Inferior 2, then detach Inferior 1. > +gdb_test "info threads" ".*" "threads before stepi" > +gdb_test "stepi" > +gdb_test "info threads" ".*" "threads after stepi" > + > +gdb_test "set debug infrun on" > +gdb_test_multiple "detach inferior 1" "" { > + -re "resuming previously stepped thread.*$gdb_prompt" { > + fail $gdb_test_name > + } > + -re "$gdb_prompt $" { > + pass $gdb_test_name > + } > +} > -- > 2.25.1 Intel Deutschland GmbH Registered Address: Am Campeon 10, 85579 Neubiberg, Germany Tel: +49 89 99 8853-0, www.intel.de Managing Directors: Christin Eisenschmid, Sharon Heck, Tiffany Doon Silva = Chairperson of the Supervisory Board: Nicole Lau Registered Office: Munich Commercial Register: Amtsgericht Muenchen HRB 186928