From patchwork Mon Oct 30 16:11:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 78772 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2D3E53861853 for ; Mon, 30 Oct 2023 16:12:12 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 9B772385842C for ; Mon, 30 Oct 2023 16:11:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9B772385842C Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 9B772385842C Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698682294; cv=none; b=BoCF4ifAU7r8QmvleNsul89+JK5yxwQ5Qx95CkyUljLzdwZtG1RZZoC9GlhPsgCecfPev+ZkLEcTVRiBi16IqchZRHxRc63GquLtmwWL5cz8DQczP353Ud+C3cUCR1VPTpz7XFS/RJhYNVxucDgrjNeiby1MVpbVbTGSR10/KRA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698682294; c=relaxed/simple; bh=47fKeBygPuATwChJhm/SQGz6I5Jwki7TGdgXyJk7hHY=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=QCsjZodkZDXwFhl+FrD8AWAdrDhXM9omyzhx/hzU1sm/KJ+DAW7+pI9VGYAVWSxQnwqjGIdveusA25izjeJ66Vk2tqcGB4eQ/y7c18gKRGF+kcv4GRwQpcPmTR8NiifenSkQwj7+SW05M3yphn0cHbkKI2BgN+0vrCYnzABz9rU= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698682293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KbtAqkhfuTpXuNA/wnUDsxtgDgJU2clQ2cBUhLopvik=; b=TlLxJi41Lk2mEfmSp0wL8TtVA4cR0a2zjotTVAeStwANpZ5Q0khz0+4syhk4gNWjw2i1pv OXRsA+KuCG2hmdRATB/7+i+13apiWezCvjXXKk2i4+ElHKCZAZHIoNxXAec67YZFInt+Ih lPaEkComA9egDbe5W2eYjr+R/P7XK48= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-633-IvphMXOtO8q9F26AWoM3uQ-1; Mon, 30 Oct 2023 12:11:31 -0400 X-MC-Unique: IvphMXOtO8q9F26AWoM3uQ-1 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-9d2606301eeso187767466b.0 for ; Mon, 30 Oct 2023 09:11:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698682290; x=1699287090; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KbtAqkhfuTpXuNA/wnUDsxtgDgJU2clQ2cBUhLopvik=; b=K2WmPYidLOQAkJ/wDsdzyLNoMqh/I6gpCn+5oIeI66yY1nkY2aQsSIrF9z5z8z8VG+ hMaKDWxkHso1gCf8q+AD18yZqDUBKLZb29cAbpTbamThS/v+adBUnXwzN4P3Rt55V48D cNo0t2owDRY7wAVpqOPbARfgwML+6kDlzZ5f4hM8R8iuzFSMZLFDNT+nJ/9FYE/nOMUd ndJGJo/DCzSDz365Sqzil9dZ7MIQsJF1Mdzon3yrDJqkJD8J6NfVKJsWdRMsmS/YKpyd iFttnj5doEENgt96TlDoumjyIqmaonmHRI/GwoT79LYAKU5blFgl4HLF3MDhHSif23+/ dc6Q== X-Gm-Message-State: AOJu0YwmHO6J+t8h39jMxKFLHrl/dc+Ee2bokapXlzzpjDcCY+V9pkU4 LtfOl+K/WGbv3Bz4c0KnogKAe25quqh57EkHWBDIpFA97xZZlHJczqVvzL6T+emk2pH8MAf1j4G f2ThxVa3g+QGBfsgHi8Em793SI5bZNId15esa9sOlOI04AYByZpkUAVhve69M8AWV7PI/lt783V i62DOGvQ== X-Received: by 2002:a17:906:d7a2:b0:9ae:577b:3832 with SMTP id pk2-20020a170906d7a200b009ae577b3832mr62034ejb.24.1698682290321; Mon, 30 Oct 2023 09:11:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGwM0FEPYlgUQO2oz/107lxYyU46/h569BEI2s02JEMhsgTi+MNcsCVHf8KqPXTRnbQxikOcA== X-Received: by 2002:a17:906:d7a2:b0:9ae:577b:3832 with SMTP id pk2-20020a170906d7a200b009ae577b3832mr62016ejb.24.1698682289972; Mon, 30 Oct 2023 09:11:29 -0700 (PDT) Received: from localhost ([31.111.84.209]) by smtp.gmail.com with ESMTPSA id ha11-20020a170906a88b00b0099bc80d5575sm6104589ejb.200.2023.10.30.09.11.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Oct 2023 09:11:29 -0700 (PDT) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCHv6 09/10] gdb: remove tracepoint_probe_create_sals_from_location_spec Date: Mon, 30 Oct 2023 16:11:13 +0000 Message-Id: <3385be7c34120232174ade9d6bac51f92fcca012.1698682161.git.aburgess@redhat.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, 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 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org The tracepoint_probe_create_sals_from_location_spec function just forwards all its arguments to bkpt_probe_create_sals_from_location_spec, and is only used in one place. Lets delete tracepoint_probe_create_sals_from_location_spec and replace it with bkpt_probe_create_sals_from_location_spec. There should be no user visible changes after this commit. --- gdb/breakpoint.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 34dd7c320b1..e4be2ac027b 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -284,9 +284,6 @@ static bool strace_marker_p (struct breakpoint *b); static void bkpt_probe_create_sals_from_location_spec (location_spec *locspec, struct linespec_result *canonical); -static void tracepoint_probe_create_sals_from_location_spec - (location_spec *locspec, - struct linespec_result *canonical); const struct breakpoint_ops code_breakpoint_ops = { @@ -301,10 +298,11 @@ static const struct breakpoint_ops bkpt_probe_breakpoint_ops = create_breakpoints_sal, }; -/* Tracepoints set on probes. */ +/* Tracepoints set on probes. We use the same methods as for breakpoints + on probes. */ static const struct breakpoint_ops tracepoint_probe_breakpoint_ops = { - tracepoint_probe_create_sals_from_location_spec, + bkpt_probe_create_sals_from_location_spec, create_breakpoints_sal, }; @@ -12221,17 +12219,6 @@ tracepoint::print_recreate (struct ui_file *fp) const gdb_printf (fp, " passcount %d\n", pass_count); } -/* Virtual table for tracepoints on static probes. */ - -static void -tracepoint_probe_create_sals_from_location_spec - (location_spec *locspec, - struct linespec_result *canonical) -{ - /* We use the same method for breakpoint on probes. */ - bkpt_probe_create_sals_from_location_spec (locspec, canonical); -} - void dprintf_breakpoint::re_set () {