From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from CAN01-YQB-obe.outbound.protection.outlook.com (mail-yqbcan01on2058.outbound.protection.outlook.com [40.107.116.58]) by sourceware.org (Postfix) with ESMTPS id 19DDD3858C2C for ; Tue, 7 Mar 2023 20:52:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 19DDD3858C2C Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=efficios.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=efficios.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lNJfgMjXbxyorQFsx6m10AxlK5lw9AysRF1wd2xIhSje8FYAP7dcU6z2ALbF7Y16P4jX2oehiJEOsv6zenSIOaxncMaMJ8xnjHLWXl/4T2LA/wTfYXYYilGl/8/+25uIJp5GysGHXitAiO/tSbfIaBnVs28H48aoyJow73s9sFj0xim1eIna1ZMemYPOU2uWfmY0iGmZ8U1yYofxrNFBpbymLe/N0dBxnmKv1xbTAVtyoeWSS8Gqvh5M2SBCmfxOErRBBGzkbzfnHfAZOyvI8GyQui8gd3qspZ9Nk5MkGilgd9/T3ldp1SvlOJkoPwTgMT4VZ0W5LQK1CIrFSWODog== 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=BSAv2c1rKOSxS0tzH3/acDRcQWEowBvCoo7F++2fNXU=; b=DZhikUUoXtg8mMEXP6O3RjgFs/RMFHG1EXv9QQEVjWWIhVZyzXR3WvRtgiEOZIQo9irAe7tzjgLGdArQGRfTMD6T/74lDCMqZOin5dtZbAf5lfolUvu3NltdY4lZd69rRZLeSrx+eodZNC9qqNrw0YxYt8NjkhPGsmhMBEayleJZeGFDeX3Gv6PTrQAfCwenXaIWGSiPsCu/XaeqFzXGMJmlZHhb/y3fUIqELqWwczjBtJp/ah9sZUzOYoPkxllJ69ATPjsW3vJhcnrJ2Gnw0z8r4u6Atyn+jcYn6qRzhQJMZGU92xd5eGZx968EBSeljEgFEPOtcQLGnHeQeFN0Mg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=efficios.com; dmarc=pass action=none header.from=efficios.com; dkim=pass header.d=efficios.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=efficios.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BSAv2c1rKOSxS0tzH3/acDRcQWEowBvCoo7F++2fNXU=; b=W4rlT6wTXtpKOgu4ev+6NlLlAKFUW0R9sxnHZLr1MfwEUrO4Cg/HLjM0RnVBb76WFDDXRUB8poipzzAFParIU72jVSMRafzCIlSKr7LHyr5stw4x29PMA3YwgUi+jVYL/EpkloTjWVwUmjcWXWUh6+wGqgjMMGws689iT0HIfymWah0FOw1uN9e0HB+yxifG57NHDhWr3SPMasBXAgx/Pfn+nZ3atqRBW4uyE1PYK/lfB0IBoEBauaOVtI/ckoT/UXtu9/lAyfnFC1H6cCCP7i4mPWpRNq304ThvCvxIJQc9oF/AJrqyeftzqYyzgaS0i/2rG1tbSmBbc2Iwd8itig== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=efficios.com; Received: from YT1PR01MB2828.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:a::23) by YT3PR01MB5844.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:5d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.16; Tue, 7 Mar 2023 20:52:12 +0000 Received: from YT1PR01MB2828.CANPRD01.PROD.OUTLOOK.COM ([fe80::2e20:aebe:9849:7408]) by YT1PR01MB2828.CANPRD01.PROD.OUTLOOK.COM ([fe80::2e20:aebe:9849:7408%5]) with mapi id 15.20.6156.029; Tue, 7 Mar 2023 20:52:12 +0000 Message-ID: Date: Tue, 7 Mar 2023 15:52:10 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.8.0 Subject: Re: [PATCH 1/3] gdb: make get_interp_info return a reference Content-Language: en-US To: Tom Tromey , Simon Marchi via Gdb-patches Cc: Simon Marchi References: <20230302203224.118345-1-simon.marchi@efficios.com> <20230302203224.118345-2-simon.marchi@efficios.com> <874jqws6o5.fsf@tromey.com> <2526b60c-8a86-dc29-6c23-79a00461c591@simark.ca> <871qm0qoi7.fsf@tromey.com> From: Simon Marchi In-Reply-To: <871qm0qoi7.fsf@tromey.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: YQXP288CA0004.CANP288.PROD.OUTLOOK.COM (2603:10b6:c00:41::17) To YT1PR01MB2828.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:a::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: YT1PR01MB2828:EE_|YT3PR01MB5844:EE_ X-MS-Office365-Filtering-Correlation-Id: 9ee355e0-02f9-4f68-4be9-08db1f4dd372 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2LgIeRiLQn6BMGwgWYWwMYPYBdpEemZOpFtN391XB5HovO0c7Lm9xp9Q6W0CxgnBAN2ml5SJ/vFpgfefQlI30lUz+Pmua8Uvf82we36NxmqzWJA+tmbWlG7Moc1JLy1si9mtfZCGs4dilG16m9zq0OsiZ474WPTSqfWwW66kBJ4DfbXHgMsxAiYC0lzdRKZLxikvPd7wi+EES1WSv8jqoeFkOtvdgRaAwVZG16VVLnL9piXL1gBJJg0zJsOEgh1YRhmbXJsZ+1Ip09HscR8cDA7pxGIH3so9pNA7aPAhYF7AVORm75Ef7yhZe9P2rwjI/JTm9Wqkr14ZSCI5/6M93laW9T+DDNkGZbKK7ShDuz+tNdkEbnEck7iP5fO3d6UB63ZKX38+EKG7sdN0RIt2F12eeInDNjnl8Q21WhdRCHls0MrYabUj8lMADtvIuOxGLDcS4y4kr+7WOMLtSuq15rFcmhno+2yHF8ie1FI0sa/SyNq2d9NrbMHZSTTXAA9KWp4GolNG2OhUbaQPQHaer/UzJDMzxHZagRtG8mTrbVMeqqex34fQYDHu1KSAFEPZz6wOZrmJu+ggy8SMjqx3EVMgHswMzlSHveV8OSd8oP4vgx6utIUNZ+FPEx93k8Sq/Mc4p3G0wgyNhy/GxwyOsMMSYUBJbz0QAjmFJnb0csrcqxr++G0y3iwzBIkaq9Z8Jd4EcI53/V1e4FIdGauyj+85rxZYtwQ6UQSF2bdyHf0= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:YT1PR01MB2828.CANPRD01.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230025)(39830400003)(136003)(366004)(376002)(396003)(346002)(451199018)(110136005)(316002)(2616005)(31686004)(36756003)(26005)(478600001)(6506007)(53546011)(6512007)(66946007)(4326008)(8676002)(2906002)(38100700002)(66476007)(66556008)(31696002)(41300700001)(8936002)(44832011)(186003)(83380400001)(5660300002)(6486002)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?aExmS29BblVRQ0djTHhnQThoNjVoV3ZncG1LazlpanlUc0JVK0ZETTRPdFBp?= =?utf-8?B?Y3cwSm52cnlwNnhNTWhKYUEveTNocFA0bkpuc2NhTzVpT0NlMGVjZGhjSlMw?= =?utf-8?B?azZiNWZKdGxXQW0remhBWFBXV2IreElhaWhWdzVLRTZZVjgvTTQ2Y0ljL0R1?= =?utf-8?B?WnJVbEJBbHdNc2N4OHBDWDFhTFkvVjhkVFF6ZkNNNnVSZXI3WXNUMCt1VExj?= =?utf-8?B?dkJmSUtlUVFUMHh6NTJ2aFI0RXAybm1rb3Y1clIyZFViWk1xRmdsdXFrYkZT?= =?utf-8?B?V0EyNk5XdGg3MlBrSFU3aTBxUnRocnBpaTVuaUhlKytaSjVCUE1NbkhkeWVT?= =?utf-8?B?bFVkekFlNDhGcmlnT3VpbUhHeTVobC9HZjZJT0lNTDRYd3Z3T2NuOXVUUEtI?= =?utf-8?B?TGxPczFPOG50Y0F2UllmT0RaK1EyWVpnSWtJb0FNbmFvRSs2WW5lS3Roenha?= =?utf-8?B?aHk1MUE0aFNOcE1YWVBUelZzSnhTTEMvbS9yblF0SHFTdlFiNFM1azF6UjFI?= =?utf-8?B?c2JNR0t0QlAvVHJtSTk2bWFyYUZkVXE0RzBwOWpZMG9sTTNjSCt5clk3UHZZ?= =?utf-8?B?UVFWOUpuYkxORCtpQmgwejlWWkhJSEwwMG1VbFl2Wi91dWJIdy9oZ1FrSk5C?= =?utf-8?B?NktvaWFOQ3MxY1JFY3ZXQ1R1bmphWFdUdjBxdWs0OXJYZHlZR2xweW1uYXZi?= =?utf-8?B?cmc3RlE4WlJ0d3lUY3h6ejBaeU8vb0N3NDJmalRaWHAxVGdMeXByUUtWQnVF?= =?utf-8?B?cDRReUNDcFVzU0Z5bVhmVVlQSkF0WW9odDhxT3lZUjVRTVJPcnNGMWV0NlVJ?= =?utf-8?B?dTU5N1F0aStTbzhaTUpyMXgxOXNnYVNsMDdsZU12SmhScnRNdFE3Q3B3MHVL?= =?utf-8?B?Z2lBQVhBWnh5MzRDdTdLVnNrVWI2dFNtSTczVlZDa1dCb0RsWGVMWnQ2V2pq?= =?utf-8?B?OE12aHN3ZUh6YmlvdTlNejFOdXNGbVRyV05IckVhL0FjSzJBOVVhK1czMGdP?= =?utf-8?B?eHIxQ3NVR0g2Z3pIMDJINWFqWUFRQi9TTGsyN3VBTy83Um1lVzJCQ0dWbDVJ?= =?utf-8?B?U09KNU1zc1NhejBXZmFwbFp6Q1pRMDQzQXlldTUxeGp3YmxiYTdTUHY3aGlr?= =?utf-8?B?ZmEyZjBCcHBEdjdQdzQyYWEzeTFBQnFaMTRvejVtZUZSd2VLWFVyckRiUHpT?= =?utf-8?B?c01RejJIS2x4NHdWTG9aakJPbG1COFhSelZVOU8yQTd2NmVXYXVYOUM3VDJI?= =?utf-8?B?dEZMUm1EUFdoc0ZwNTYyazZMWko0djJCU1BtRThsRElmK3k1SXBwYlVEcEpX?= =?utf-8?B?YWZjV3lJWEZxbVFqYnVYWHQ5bWFSQUc1YWZlYmx4MnJlaWhEQVVGaVUzM2o0?= =?utf-8?B?b3FhMGNkVi8zN2RGNDA1RzZSenArbEtsek15Sy9jcmw3aTd0NjJYeDQ5ZWI4?= =?utf-8?B?QjBQNDZyY29xVnBCN01PWGxSQnNWVEVCMUlVTkpxbXp4Z21iTGFyY09HS1dv?= =?utf-8?B?TXkzNDVmYVNCT3hzUjVXYkc5MElRMzdtWVRWQ2JoVThBZUFGbmF0bk1YM2pS?= =?utf-8?B?WGNkQnc2RU9aV2xJaGVXTVd1QVdkNy9GQUhpNGc5Z2xDOHVKUHk4VWNVc2Zq?= =?utf-8?B?eDdiSHlsZWx3a0R5VDFacEZLSmwvNVczSjBrbnpLNVpyQThMRWFsbzdMNDMv?= =?utf-8?B?V1E1ZllHNFdOc1VmOTROQXAzN0ZQeGtGQ1V4YjlRNFpkdXIvcXB5NFFVUmZC?= =?utf-8?B?MmwyR0RZTzJvVDUrNmgwN280NkhWMnFJU0FXK3JpdWhwSFJpNGRoVDlBU2JE?= =?utf-8?B?VDRZRjErZE5CTmx2Nmg1ZzYxYU0xdStzV2NMNUc1RHhiS0tJcDJlU0hQM1lp?= =?utf-8?B?N0F3ak5HS0l6Z1p4Z3lobWYxb0Y2b3VYc1k0R0xYS3VGcHlRYkJCdHRJTDdX?= =?utf-8?B?RWhqelBsMnVmeHJmaVRKVmhwT0IvY0hPYjlKcFI1S3hVb1pQRFZZOTZCMnlC?= =?utf-8?B?SUdDd25ndFhkR2hLMnlBdnFXUVJqOGxhRUJCaFF2Y1VGSWl5SlQ1bVQxUmdC?= =?utf-8?B?VldIaTJWZmowRFBMSms0R1RENDM5d0g0OUJ5WU1ycHpiQjdFUmJBZ2VUa0ho?= =?utf-8?Q?wxAOfnDFHGRUBzRy5jISiOeoi?= X-OriginatorOrg: efficios.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9ee355e0-02f9-4f68-4be9-08db1f4dd372 X-MS-Exchange-CrossTenant-AuthSource: YT1PR01MB2828.CANPRD01.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Mar 2023 20:52:12.5045 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4f278736-4ab6-415c-957e-1f55336bd31e X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: dA9zEQwms8FEimrs9S4BsWoTC/o1X3k0vwb5dGLBKFMgTPM1oSlIHx+5alEVV5KpQc53w8AbFZAe9MUKq5TnEg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: YT3PR01MB5844 X-Spam-Status: No, score=-3038.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,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: On 3/7/23 15:45, Tom Tromey wrote: >>>>>> "Simon" == Simon Marchi via Gdb-patches writes: > > Simon> Here's what the patch looks like now: > > Simon> if (ui->interp_info == NULL) > Simon> - ui->interp_info = XCNEW (struct ui_interp_info); > Simon> - return ui->interp_info; > Simon> + ui->interp_info = new ui_interp_info; > > Unfortunately XCNEW -> new also means adding member initializers to > ensure they are 0. Didn't I? Oh, I did but it's uncommitted in my git tree. I swear! Here's the updated patch. >From 67119cc8ca5e2d4729f39455829fdc5fa095932a Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Thu, 2 Mar 2023 15:32:22 -0500 Subject: [PATCH] gdb: make get_interp_info return a reference get_interp_info and get_current_interp_info always return non-nullptr, so they can return a reference instead of a pointer. Since we don't need to copy it, make ui_interp_info non-copyiable, to avoid a copying it in a local variable, instead of getting a reference. Change-Id: I6d8dea92dc26a58ea340d04862db6b8d9cf906a0 --- gdb/interps.c | 84 ++++++++++++++++++++++++++------------------------- 1 file changed, 43 insertions(+), 41 deletions(-) diff --git a/gdb/interps.c b/gdb/interps.c index 9c7908bde1ca..12a0048d1020 100644 --- a/gdb/interps.c +++ b/gdb/interps.c @@ -45,30 +45,32 @@ struct ui_interp_info { + ui_interp_info () = default; + DISABLE_COPY_AND_ASSIGN (ui_interp_info); + /* Each top level has its own independent set of interpreters. */ - struct interp *interp_list; - struct interp *current_interpreter; - struct interp *top_level_interpreter; + interp *interp_list = nullptr; + interp *current_interpreter = nullptr; + interp *top_level_interpreter = nullptr; /* The interpreter that is active while `interp_exec' is active, NULL at all other times. */ - struct interp *command_interpreter; + interp *command_interpreter = nullptr; }; -/* Get UI's ui_interp_info object. Never returns NULL. */ +/* Get UI's ui_interp_info object. */ -static struct ui_interp_info * +static ui_interp_info & get_interp_info (struct ui *ui) { if (ui->interp_info == NULL) - ui->interp_info = XCNEW (struct ui_interp_info); - return ui->interp_info; + ui->interp_info = new ui_interp_info; + return *ui->interp_info; } -/* Get the current UI's ui_interp_info object. Never returns - NULL. */ +/* Get the current UI's ui_interp_info object. */ -static struct ui_interp_info * +static ui_interp_info & get_current_interp_info (void) { return get_interp_info (current_ui); @@ -128,12 +130,12 @@ interp_factory_register (const char *name, interp_factory_func func) static void interp_add (struct ui *ui, struct interp *interp) { - struct ui_interp_info *ui_interp = get_interp_info (ui); + ui_interp_info &ui_interp = get_interp_info (ui); gdb_assert (interp_lookup_existing (ui, interp->name ()) == NULL); - interp->next = ui_interp->interp_list; - ui_interp->interp_list = interp; + interp->next = ui_interp.interp_list; + ui_interp.interp_list = interp; } /* This sets the current interpreter to be INTERP. If INTERP has not @@ -150,13 +152,13 @@ interp_add (struct ui *ui, struct interp *interp) static void interp_set (struct interp *interp, bool top_level) { - struct ui_interp_info *ui_interp = get_current_interp_info (); - struct interp *old_interp = ui_interp->current_interpreter; + ui_interp_info &ui_interp = get_current_interp_info (); + struct interp *old_interp = ui_interp.current_interpreter; /* If we already have an interpreter, then trying to set top level interpreter is kinda pointless. */ - gdb_assert (!top_level || !ui_interp->current_interpreter); - gdb_assert (!top_level || !ui_interp->top_level_interpreter); + gdb_assert (!top_level || !ui_interp.current_interpreter); + gdb_assert (!top_level || !ui_interp.top_level_interpreter); if (old_interp != NULL) { @@ -164,9 +166,9 @@ interp_set (struct interp *interp, bool top_level) old_interp->suspend (); } - ui_interp->current_interpreter = interp; + ui_interp.current_interpreter = interp; if (top_level) - ui_interp->top_level_interpreter = interp; + ui_interp.top_level_interpreter = interp; if (interpreter_p != interp->name ()) interpreter_p = interp->name (); @@ -203,10 +205,10 @@ interp_set (struct interp *interp, bool top_level) static struct interp * interp_lookup_existing (struct ui *ui, const char *name) { - struct ui_interp_info *ui_interp = get_interp_info (ui); + ui_interp_info &ui_interp = get_interp_info (ui); struct interp *interp; - for (interp = ui_interp->interp_list; + for (interp = ui_interp.interp_list; interp != NULL; interp = interp->next) { @@ -259,8 +261,8 @@ void current_interp_set_logging (ui_file_up logfile, bool logging_redirect, bool debug_redirect) { - struct ui_interp_info *ui_interp = get_current_interp_info (); - struct interp *interp = ui_interp->current_interpreter; + ui_interp_info &ui_interp = get_current_interp_info (); + struct interp *interp = ui_interp.current_interpreter; interp->set_logging (std::move (logfile), logging_redirect, debug_redirect); } @@ -269,12 +271,12 @@ current_interp_set_logging (ui_file_up logfile, bool logging_redirect, struct interp * scoped_restore_interp::set_interp (const char *name) { - struct ui_interp_info *ui_interp = get_current_interp_info (); + ui_interp_info &ui_interp = get_current_interp_info (); struct interp *interp = interp_lookup (current_ui, name); - struct interp *old_interp = ui_interp->current_interpreter; + struct interp *old_interp = ui_interp.current_interpreter; if (interp) - ui_interp->current_interpreter = interp; + ui_interp.current_interpreter = interp; return old_interp; } @@ -282,8 +284,8 @@ scoped_restore_interp::set_interp (const char *name) int current_interp_named_p (const char *interp_name) { - struct ui_interp_info *ui_interp = get_current_interp_info (); - struct interp *interp = ui_interp->current_interpreter; + ui_interp_info &ui_interp = get_current_interp_info (); + struct interp *interp = ui_interp.current_interpreter; if (interp != NULL) return (strcmp (interp->name (), interp_name) == 0); @@ -304,12 +306,12 @@ current_interp_named_p (const char *interp_name) struct interp * command_interp (void) { - struct ui_interp_info *ui_interp = get_current_interp_info (); + ui_interp_info &ui_interp = get_current_interp_info (); - if (ui_interp->command_interpreter != NULL) - return ui_interp->command_interpreter; + if (ui_interp.command_interpreter != NULL) + return ui_interp.command_interpreter; else - return ui_interp->current_interpreter; + return ui_interp.current_interpreter; } /* See interps.h. */ @@ -336,11 +338,11 @@ interp_supports_command_editing (struct interp *interp) void interp_exec (struct interp *interp, const char *command_str) { - struct ui_interp_info *ui_interp = get_current_interp_info (); + ui_interp_info &ui_interp = get_current_interp_info (); /* See `command_interp' for why we do this. */ scoped_restore save_command_interp - = make_scoped_restore (&ui_interp->command_interpreter, interp); + = make_scoped_restore (&ui_interp.command_interpreter, interp); interp->exec (command_str); } @@ -365,7 +367,7 @@ clear_interpreter_hooks (void) static void interpreter_exec_cmd (const char *args, int from_tty) { - struct ui_interp_info *ui_interp = get_current_interp_info (); + ui_interp_info &ui_interp = get_current_interp_info (); struct interp *old_interp, *interp_to_use; unsigned int nrules; unsigned int i; @@ -387,7 +389,7 @@ interpreter_exec_cmd (const char *args, int from_tty) if (nrules < 2) error (_("Usage: interpreter-exec INTERPRETER COMMAND...")); - old_interp = ui_interp->current_interpreter; + old_interp = ui_interp.current_interpreter; interp_to_use = interp_lookup (current_ui, prules[0]); if (interp_to_use == NULL) @@ -425,9 +427,9 @@ interpreter_completer (struct cmd_list_element *ignore, struct interp * top_level_interpreter (void) { - struct ui_interp_info *ui_interp = get_current_interp_info (); + ui_interp_info &ui_interp = get_current_interp_info (); - return ui_interp->top_level_interpreter; + return ui_interp.top_level_interpreter; } /* See interps.h. */ @@ -435,9 +437,9 @@ top_level_interpreter (void) struct interp * current_interpreter (void) { - struct ui_interp_info *ui_interp = get_interp_info (current_ui); + ui_interp_info &ui_interp = get_interp_info (current_ui); - return ui_interp->current_interpreter; + return ui_interp.current_interpreter; } /* This just adds the "interpreter-exec" command. */ base-commit: 4779ed9757fa71e6743fb7fc1f9eeae8267ae36c -- 2.39.2