From patchwork Fri Oct 18 12:52:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Edlinger X-Patchwork-Id: 35133 Received: (qmail 92007 invoked by alias); 18 Oct 2019 12:52:45 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 91998 invoked by uid 89); 18 Oct 2019 12:52:44 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-16.6 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_STOCKGEN, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.1 spammy=H*c:HHH X-HELO: EUR02-AM5-obe.outbound.protection.outlook.com Received: from mail-oln040092067070.outbound.protection.outlook.com (HELO EUR02-AM5-obe.outbound.protection.outlook.com) (40.92.67.70) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 18 Oct 2019 12:52:42 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nU7pLBzAaDfBLuKuhMaFAWYf2hfzleMKSak7YWjcNOgf9GKnVciNKHYRuDqezFU+aDdUKYfYfBezDLT5n5NDyHVuPnJhxYij7AOHaRqXc2XHgkavLOxX5xfZ95s1xKyQvkNfkNh9DflecJiPl9E5faReBNLC/zpwVjh0vY7ApTQZv5W2FsKKOubAjOoNSnOuXr6/2FBTjA9gKgMChyzQIzbOIa+qGtYdAnqMpST5NOi7iuz/x5f8BV0lhrlGRS0mzSZbWf/eUNnJYsv00U0UTo5FaDy3bC10s1qbJPNzNTCXxzuW6QwNGx8W4K7/WugHzMP7Gmoz2Aa2qzWnFk2q0A== 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-SenderADCheck; bh=QhPgiAJLPjTxrsossq+zJa60GcGrKUxfW+f0eNhlZO4=; b=WPMj/bmIldZporVPVs2XB0+Na4oUMyHi07G8M9D1/ikPHzoRsk54+TKhwjCljVMgZNTZm2z6rDfF3LpVpn9xaCwoyz0TVfYnPN9oYKC6+5P5lTKygbrzeDxrOdBcanUm0BLPXPd63/waa+gbZB9sgdcOaZr6N+S94bC3JQDEpatI9pJwgcRrl19QEsCM4mIGROkasNE6hFFPPxgp9RGCIO+lnzRvJozsgBLibyRMhUM1RMXM9NeEaTbV04P1gHs6q4DfiOmJD4LWmXFo2iquEL/CIe80kpehpLDbuenFjr+Zr82J1NbWVj47ZuvcxANyo9ZnUBbowStI0a+6BkKD6w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from AM5EUR02FT058.eop-EUR02.prod.protection.outlook.com (10.152.8.51) by AM5EUR02HT065.eop-EUR02.prod.protection.outlook.com (10.152.9.163) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2367.14; Fri, 18 Oct 2019 12:52:40 +0000 Received: from VI1PR03MB4528.eurprd03.prod.outlook.com (10.152.8.54) by AM5EUR02FT058.mail.protection.outlook.com (10.152.9.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2367.14 via Frontend Transport; Fri, 18 Oct 2019 12:52:40 +0000 Received: from VI1PR03MB4528.eurprd03.prod.outlook.com ([fe80::f12a:6f14:2368:e758]) by VI1PR03MB4528.eurprd03.prod.outlook.com ([fe80::f12a:6f14:2368:e758%4]) with mapi id 15.20.2347.024; Fri, 18 Oct 2019 12:52:40 +0000 From: Bernd Edlinger To: "gdb-patches@sourceware.org" Subject: [PATCH] Make "skip" work on inline frames Date: Fri, 18 Oct 2019 12:52:39 +0000 Message-ID: x-microsoft-original-message-id: <828f3924-03c4-9986-edd8-23b92a31b7b4@hotmail.de> x-ms-exchange-transport-forked: True MIME-Version: 1.0 Hi, I noticed that skip is not working well on inlined frames which may happen in optimized gcc stage3 binary, where step stops at functions which are marked for skip, whenever they happen to be in-lined, where it is ignored if the frame is marked for skip, thus currently skipped frames are only checked when the skipped function is not inlined, which is usually only the case in non-optimized builds. Thanks Bernd. From 6f24c762bf45d7b1b2d2e9285dfe2250b654b8ea Mon Sep 17 00:00:00 2001 From: Bernd Edlinger Date: Fri, 18 Oct 2019 14:28:45 +0200 Subject: [PATCH] Check all inline frames if they are marked for skip. This makes the skip command work in optimized builds, where skipped functions may be inlined. Previously that was only working when stepping into a non-inlined function. --- gdb/infcmd.c | 15 ++++++++++++++- gdb/infrun.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 65 insertions(+), 4 deletions(-) diff --git a/gdb/infcmd.c b/gdb/infcmd.c index 7105774..9e4de66 100644 --- a/gdb/infcmd.c +++ b/gdb/infcmd.c @@ -58,6 +58,7 @@ #include "thread-fsm.h" #include "top.h" #include "interps.h" +#include "skip.h" #include "gdbsupport/gdb_optional.h" #include "source.h" #include "cli/cli-style.h" @@ -1112,6 +1113,9 @@ prepare_one_step (struct step_command_fsm *sm) && inline_skipped_frames (tp)) { ptid_t resume_ptid; + const char *fn = NULL; + symtab_and_line sal; + struct symbol *sym; /* Pretend that we've ran. */ resume_ptid = user_visible_resume_ptid (1); @@ -1119,7 +1123,16 @@ prepare_one_step (struct step_command_fsm *sm) step_into_inline_frame (tp); sm->count--; - return prepare_one_step (sm); + + sal = find_frame_sal (frame); + sym = get_frame_function (frame); + + if (sym != NULL) + fn = SYMBOL_PRINT_NAME (sym); + + if (sal.line == 0 + || !function_name_is_marked_for_skip (fn, sal)) + return prepare_one_step (sm); } pc = get_frame_pc (frame); diff --git a/gdb/infrun.c b/gdb/infrun.c index 07aebfa..04c1eee 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -4041,6 +4041,45 @@ stepped_in_from (struct frame_info *frame, struct frame_id step_frame_id) return 0; } +/* Look for an inline frame that is marked for skip. + If PREV_FRAME is TRUE start at the previous frame, + otherwise start at the current frame. Stop at the + first non-inline frame, or at the frame where the + step started. */ + +static bool +inline_frame_is_marked_for_skip (bool prev_frame, struct thread_info *tp) +{ + struct frame_info *frame = get_current_frame (); + + if (prev_frame) + frame = get_prev_frame (frame); + + for (; frame != NULL; frame = get_prev_frame (frame)) + { + const char *fn = NULL; + symtab_and_line sal; + struct symbol *sym; + + if (frame_id_eq (get_frame_id (frame), tp->control.step_frame_id)) + break; + if (get_frame_type (frame) != INLINE_FRAME) + break; + + sal = find_frame_sal (frame); + sym = get_frame_function (frame); + + if (sym != NULL) + fn = SYMBOL_PRINT_NAME (sym); + + if (sal.line != 0 + && function_name_is_marked_for_skip (fn, sal)) + return true; + } + + return false; +} + /* If the event thread has the stop requested flag set, pretend it stopped for a GDB_SIGNAL_0 (i.e., as if it stopped due to target_stop). */ @@ -6531,7 +6570,8 @@ process_event_stop_test (struct execution_control_state *ecs) tmp_sal = find_pc_line (ecs->stop_func_start, 0); if (tmp_sal.line != 0 && !function_name_is_marked_for_skip (ecs->stop_func_name, - tmp_sal)) + tmp_sal) + && !inline_frame_is_marked_for_skip (true, ecs->event_thread)) { if (execution_direction == EXEC_REVERSE) handle_step_into_function_backward (gdbarch, ecs); @@ -6697,7 +6737,14 @@ process_event_stop_test (struct execution_control_state *ecs) if (call_sal.line == ecs->event_thread->current_line && call_sal.symtab == ecs->event_thread->current_symtab) - step_into_inline_frame (ecs->event_thread); + { + step_into_inline_frame (ecs->event_thread); + if (inline_frame_is_marked_for_skip (false, ecs->event_thread)) + { + keep_going (ecs); + return; + } + } end_stepping_range (ecs); return; @@ -6731,7 +6778,8 @@ process_event_stop_test (struct execution_control_state *ecs) fprintf_unfiltered (gdb_stdlog, "infrun: stepping through inlined function\n"); - if (ecs->event_thread->control.step_over_calls == STEP_OVER_ALL) + if (ecs->event_thread->control.step_over_calls == STEP_OVER_ALL + || inline_frame_is_marked_for_skip (false, ecs->event_thread)) keep_going (ecs); else end_stepping_range (ecs); -- 1.9.1