From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by sourceware.org (Postfix) with ESMTPS id 724BC3858D1E for ; Tue, 24 Jan 2023 10:36:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 724BC3858D1E 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=1674556599; x=1706092599; h=from:to:subject:date:message-id:references:in-reply-to: mime-version:content-transfer-encoding; bh=V7kB+q9xkxFIhgg7B3Er9MHD6L4qWJvaC7KFmqDku8o=; b=HQYprmWGiMiDppd89oVErgi7wvL4mVqxY4453vjmj/X8yJeuT/aArlBE mCouPvbHOyxllnShLQMRUanjezJcwEmXbZ06uS8MEyDFPgNH17FBR+ky8 VShKFt71L95jWdlg59x8PkdctokGEHOMCQs44zT/J4agXy2KVGLJhcqq1 b0EFJgwIBJPmZ+qrMxu6QJ6v/LkW/rNozPVXerGNC/lJBtu+06dOvEbsi XVMYujyI8jW5T7WMOd+SIUM18VnPCqZMfAYYHDFIWs4xk/dQX/zv+DhaY O1D0t5pcSSZh1Wm4OWr5fhgBCaOLZqZgUJ5DVx8F/7idwKgaGikhmkriC w==; X-IronPort-AV: E=McAfee;i="6500,9779,10599"; a="323960223" X-IronPort-AV: E=Sophos;i="5.97,242,1669104000"; d="scan'208";a="323960223" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Jan 2023 02:36:38 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10599"; a="694287357" X-IronPort-AV: E=Sophos;i="5.97,242,1669104000"; d="scan'208";a="694287357" Received: from fmsmsx602.amr.corp.intel.com ([10.18.126.82]) by orsmga001.jf.intel.com with ESMTP; 24 Jan 2023 02:36:37 -0800 Received: from fmsmsx601.amr.corp.intel.com (10.18.126.81) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16; Tue, 24 Jan 2023 02:36:36 -0800 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16 via Frontend Transport; Tue, 24 Jan 2023 02:36:36 -0800 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (104.47.56.170) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.16; Tue, 24 Jan 2023 02:36:31 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NZkomnclo9WCf9cSY4ROEKPtgRNN6At30DCaH5W+Cpl/VM154PMhnTbNTW8OEf2m36NPy1+sNkh6+ybzYg3Im0PWtzmx5G3Nl3d9jf7TXpdClC7cNRkY7c1xZWFIjb+H0bBtRjiKLouyB0obxp0zBGsFbfc815EBKCcPXD6ZeHAA7rMwmDHp6X8Yskz4IJrHCQ8pJIq0KlMyueFsdYQZ30nuYLdfU8La+vEO1jh0/hx4EGbYjNmBb0nzqJDFctHcjzFMrzd3jUl7DPXpqrNYTeHUGpdgKMtZvhPzAUqNBj23+4xth9SuxRNDBoWtkTb1AX86+SMpFmJDGOvYPFiRww== 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=RgmpFUt9OH7+23iO+nmHaxFI2BfeoQeVmEveseFS2RavD8LY4Fu6Vr3DqQMMyz43Vz9yzA5zYD9b9IJWdkHl5/JZLd2wimC+NT/l/gzCvq92XzDTKgYjs9+BtAKMyZMY0+BGJduBHusMaLD58pjYHxu/zfXciUaOZWDmZzbI3oT1KUuSxeXhDOtMkyT0CpTKrRrQbuQ/Wlkic4sb+pv5BP6WmF409ouX8pJi5umOmNkZgT2cLE7j9FKgtW5A/YAdeNMaU+Pi9T/E7cDOZbiNo1h/1cdQFI7wpckJd8SoVJRHsaXdUHw2LKPQHdADC1efdJVwQxgtLCaO1isG7P8qqA== 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 CY8PR11MB7012.namprd11.prod.outlook.com (2603:10b6:930:54::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.33; Tue, 24 Jan 2023 10:36:29 +0000 Received: from DM4PR11MB7303.namprd11.prod.outlook.com ([fe80::dec6:d57d:f767:c5f2]) by DM4PR11MB7303.namprd11.prod.outlook.com ([fe80::dec6:d57d:f767:c5f2%4]) with mapi id 15.20.6002.033; Tue, 24 Jan 2023 10:36:29 +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+e0yhid2YvAG6kuGZgxFBGgoQ66ty3/Q Date: Tue, 24 Jan 2023 10:36:29 +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_|CY8PR11MB7012:EE_ x-ms-office365-filtering-correlation-id: 51b2b97e-02b1-4c9b-33ea-08dafdf6daa2 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: zveUKchE8t2pFJHNmAAOfZJsh7WK5Lqn3He+5FYBCspolqOU8wpXj9qV+ocAz8ASpLWqMgtoSa31n4t3x/wh/KGDy6OCfaI0UZtbXdNnz+NkSIsM63xpwCLVXWTlXxwCNL0qI6jjzzAdjuck84pLE8ieWztKm/hHaoaksWB8phLjElfySamnvpibiBEvdlJOdhHialVD/WMRNvy+Y5zMMvCAR+eMvYc619b3WSWwNx9WR5CZp4RBi2iEy2WkOV+xYbfneCzWgvnQAQs2YawsZ9nVfMX1UtKnWTJBZ+dn9MahqZzgKyZ73Brlb5/+xNPa/903W3Opa2H9g32efcDBRxZ2lBxGS3aFHwYMn5DW9kjWuC3ioh17zMrFzRlAKSIypeay6lh/gMRCVRnhMEoi48ZzHvTtXCaeiBDHCz0mdoNhOs8j3uH0MkPau4lkenYVXO/PChqoBP9ehTm93pmka8E4J30ThIZvXdbyeWqXiXnTConMRLEkC8pdPmo3ymg5/5NWR/9ydSfGQnaNPJ93X985IA7fYWVzvX3vllAzRcCarN0m5kCjhFXu4W+pT2hQlmYAbU8C37xEU8DGNBBzcLqxJPn+YsoIau+VqW0B8tT8lsLOB+sf0eNRCAvH6nGVcyoyjUtcsdhKv5JoK7aSFp2zUbDFq9pOe8bu4bQrRUuQ/5BQ+usnB0+Ste/SKqu7wbGtxNQmDdHptbWFaSvg4IZP6M0zQvO70PaLGnWIx3sdqKvIe0l/2y7pNkPihND7 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:(13230022)(396003)(39860400002)(136003)(366004)(376002)(346002)(451199015)(38070700005)(2906002)(86362001)(33656002)(316002)(6506007)(83380400001)(478600001)(7696005)(71200400001)(26005)(5660300002)(186003)(9686003)(53546011)(30864003)(38100700002)(52536014)(8936002)(122000001)(82960400001)(6916009)(66446008)(66476007)(55016003)(8676002)(66556008)(41300700001)(66946007)(76116006)(64756008)(2004002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?mQNHlJqIR2USWqQoY/a4FF6fkvaPOwNp8GabH1Q3ebo1c8ozyvO/YvF91VKm?= =?us-ascii?Q?SHqSIdWnr0JM5AnFe4Jm/GevMOMViYl88FlINYB7ZvSF+3e0iih4nUGBURdw?= =?us-ascii?Q?RCzJgHOd68xIFjk4/GXwAHSQBefRtSjZ/tQEUj/pLogrihbuD+TB5WEZ2yEp?= =?us-ascii?Q?Hh+bDA9jXkxqz9IL/2QjqyNaHE63GMssdCNVC5gvorFnzxxp3/tcH+ydzuKq?= =?us-ascii?Q?coRHfeKlAwcqz6ulZZUHNLwH+68rnrozRN98TfcmB39utQEWxNF57plSvnCr?= =?us-ascii?Q?i/wSVhYUEmjvnzmeqTMr8mHbaMCJ/ppm8WC1TeYpFF6TzcLqfsyAMWcrDHhV?= =?us-ascii?Q?vdCjL2tr2hH30v5MkWrJswptP1AaBP2KROAgG19SiM18jnzU9eqTVIii+k2Z?= =?us-ascii?Q?tAM6X+Z+tTNpIp4lqihLsO2Ffjj75VY/F9O54QvVCgs+3qf8S5sUJiA+RdTF?= =?us-ascii?Q?X/zStSkgMF4lLJJLL41jQzntRRje2CTmAnfbsoTDOXtT3n0OML8ncLQIwKjt?= =?us-ascii?Q?8mwQAs/kc+hLM7Q6XgdTBJ61vK2xS55P5RfZm5Jkjyh86p4CBsYg6Txnjf2I?= =?us-ascii?Q?vo4gcbwIwhEJExXY5uEb01CbAFlDcAD5+CPTmBqfp69tRfXTBNU0CxgpkVCN?= =?us-ascii?Q?k5BInQy2U1OBWEeyWEk7Wq748V4FmjjUftoRQBASKiFBptt+/SS8aHDTo+zB?= =?us-ascii?Q?/i4ViEnjFxD+6b6LX0FWXsD4dF7a6nYmEhzh1lLu3uQ9qPkFso0yMVxp7rse?= =?us-ascii?Q?JjNjzSi6SR3/5kPIKJF1zfpyH/xcAiDUfZ25zNljSHKuPwSIleGPyWRJTbrE?= =?us-ascii?Q?J/SH9l2AWsA7oBB8hEZwyd7rV9tVae5/CjBycYueZzR+YsleegdDbO7Cud2N?= =?us-ascii?Q?P8QlIgxk3Iou+bOF8NsdxwEXysy4tpJWgBCXG5kpLKxVsLLLjxOhjaedFx2Z?= =?us-ascii?Q?xBKo38hrDpB7z6PYwC/EbUixxV8JQcRKgAPYWnUKKy9K18vUf5tbYsVunbr2?= =?us-ascii?Q?SDn9e52ipzdeQrPNkkO5Hzl4DzZNOkIbxbV5SJ1AiszdfW4/fKH8PTkK5fI6?= =?us-ascii?Q?3STxgktHmUB2mL54g5elhY3GQYeb9JDD6lYLnKoq9L9uClLJtz/+SB/uf8rM?= =?us-ascii?Q?q8gG3RmIMjPxZFEKkQ9BfXMxf5dmtDQ2N5mdwZCGWtgfKGV9fyJMm8imyCqB?= =?us-ascii?Q?ShCucfCI3qqnqLFyeRCb9CaGkXhsvaQ/TBdv4NPBxqnvQy8IfunriPsZYwYA?= =?us-ascii?Q?rQfhirv1YNUOxIu+pgqHntQFM95gaD3yddthr/czmbu/tqPN/jh+mlodxUb/?= =?us-ascii?Q?V9ROl9v8jCDpGb3XT8rfjZPaFmvhCskHqWQuuJwwnt2imrIW2MTcPfio6PZh?= =?us-ascii?Q?m7HFnrkwTfzhFhnmtsebTtT1TbNQ4F+Tn4TpH3o6/iUflgUn7sOfdD6b8tSp?= =?us-ascii?Q?Zbt8WMgaZ6xoKuEVZA5oMVeJ1rRxcBpL9GN036mkCWhwX9cBqsZLQj0Xetbq?= =?us-ascii?Q?XkT2v6qmyMV7KulRKfVSC3pDdYLnEo7NeqEmtkuk0fbcJBLq25xgNAvgAtUk?= =?us-ascii?Q?dsKabu1CVuq89yGo7AxnEaYS1f1cv+WczY29OosAWfbiiIULlAoOOb2d7gxP?= =?us-ascii?Q?mA=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: 51b2b97e-02b1-4c9b-33ea-08dafdf6daa2 X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Jan 2023 10:36:29.7723 (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: xeQsCmgYQf53ruIPht47k9v48FWOMyr0OkjZQIBVvzzTTQf8WI6N/sHNqlXyVZ/xhlJKoiUWZ7UcJwtCtId2/3PCK/bTAG2+3+iskclII7k= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR11MB7012 X-OriginatorOrg: intel.com Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-11.7 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_NONE,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