From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-io1-xd2f.google.com (mail-io1-xd2f.google.com [IPv6:2607:f8b0:4864:20::d2f]) by sourceware.org (Postfix) with ESMTPS id 608913858C1F for ; Mon, 18 Sep 2023 14:25:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 608913858C1F Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com Received: by mail-io1-xd2f.google.com with SMTP id ca18e2360f4ac-79d1bcf289bso76518939f.0 for ; Mon, 18 Sep 2023 07:25:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1695047139; x=1695651939; darn=sourceware.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=hQOZn+3EcpIy02hgKm0MYI3Njn7O68U2328OQBbMhoI=; b=U1YGyvtTrOY+RXiKImzzyLMThOzQ/dn8//jmGBYlDF5rj4keOuJM/6lx/WGTvh37S0 uL2mjL1lgKl5f7jRTm2isHyLoO7mTP4WxWtsI5ZWX1EpIQH2JxEHr2pLnrtinmo4Kgmu 7cT7LEPmXUcW/86ZiMsWLss68FGfo0/QVZfSVa8TdOdXfYzgFeAF+58TVSPRrtKsGXKE jpZlQJbOoT1CBvnVec+yJ36tJunqxPKloRoJ5Ugh+WxtAvTulw0hLCe6lJ+SfIC5JfLf X8auLYlGw6KjNMny8yuqMz0SSbfIxWGvgFjm9t/cXV9tt2vJOve4FbReZu9Fsu5aCmUa /4ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695047139; x=1695651939; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hQOZn+3EcpIy02hgKm0MYI3Njn7O68U2328OQBbMhoI=; b=TZ3fP/qJnItO0eupfQLAEXiULSVKC5raJAfGgeqpetJva/vjCDj78zPdQe7775XsjK dqqVqnnZkROSgHy4pPQlkKIck7GNmJCVApsT/xeLBWsCd0sTayFU5feF8DiO2GX7oYXi 64DHu236+tQ/3hfKKGdljJUOzexu1MAj+IW4jEeA9JDA6lwKktbM3IWcmJB9hmTmJPJ6 1FXvj5L23PriimP6VU+OEaJBfxlDBhhlxV3oa9J+ecmPsy6jdUOi71eTIWNZnNq3OA8A AuwtY8JPC8vso5aAxvGCb7a/0Mfiv/SXdnJF2+l+vpZsg9tjBc2798IFQn5RJpXz0XBD w9hQ== X-Gm-Message-State: AOJu0YyI9b4L9lsnnaz6Oj3XdoTRq1TAP/0qevDvIttYvswTGmcLi6OC 1kVK45G+kn1eLlg3jePQu6TGkVjKQFrwGrxpqc6m4w== X-Google-Smtp-Source: AGHT+IG2U5084BbXAgmqJ8LD2I/dsvCU9bYYEM+1To8dJZANMFcgPUJZZp12903qWV1n9g+6UrysUg== X-Received: by 2002:a05:6602:24cf:b0:794:eaef:f43e with SMTP id h15-20020a05660224cf00b00794eaeff43emr9059884ioe.1.1695047139627; Mon, 18 Sep 2023 07:25:39 -0700 (PDT) Received: from localhost.localdomain (71-211-130-31.hlrn.qwest.net. [71.211.130.31]) by smtp.gmail.com with ESMTPSA id p26-20020a056638217a00b00439ca0123f8sm1345222jak.44.2023.09.18.07.25.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 07:25:39 -0700 (PDT) From: Tom Tromey Date: Mon, 18 Sep 2023 08:25:38 -0600 Subject: [PATCH v2 4/4] Use gdb::checked_static_cast for catchpoints MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20230918-watchpoint-casts-v2-4-f636ec38fdc4@adacore.com> References: <20230918-watchpoint-casts-v2-0-f636ec38fdc4@adacore.com> In-Reply-To: <20230918-watchpoint-casts-v2-0-f636ec38fdc4@adacore.com> To: gdb-patches@sourceware.org Cc: Simon Marchi X-Mailer: b4 0.12.3 X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,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: This replaces some casts to various kinds of catchpoint with checked_static_cast. Approved-By: Simon Marchi --- gdb/ada-lang.c | 2 +- gdb/break-catch-sig.c | 10 ++++++---- gdb/break-catch-syscall.c | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 2496c099f19..b9a271bc126 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -12203,7 +12203,7 @@ ada_catchpoint::allocate_location () bool ada_catchpoint::should_stop_exception (const struct bp_location *bl) const { - struct ada_catchpoint *c = (struct ada_catchpoint *) bl->owner; + ada_catchpoint *c = gdb::checked_static_cast (bl->owner); const struct ada_catchpoint_location *ada_loc = (const struct ada_catchpoint_location *) bl; bool stop; diff --git a/gdb/break-catch-sig.c b/gdb/break-catch-sig.c index 10c8b81f8e8..7a07fb61100 100644 --- a/gdb/break-catch-sig.c +++ b/gdb/break-catch-sig.c @@ -103,7 +103,8 @@ signal_to_name_or_int (enum gdb_signal sig) int signal_catchpoint::insert_location (struct bp_location *bl) { - struct signal_catchpoint *c = (struct signal_catchpoint *) bl->owner; + signal_catchpoint *c + = gdb::checked_static_cast (bl->owner); if (!c->signals_to_be_caught.empty ()) { @@ -130,7 +131,8 @@ int signal_catchpoint::remove_location (struct bp_location *bl, enum remove_bp_reason reason) { - struct signal_catchpoint *c = (struct signal_catchpoint *) bl->owner; + signal_catchpoint *c + = gdb::checked_static_cast (bl->owner); if (!c->signals_to_be_caught.empty ()) { @@ -165,8 +167,8 @@ signal_catchpoint::breakpoint_hit (const struct bp_location *bl, CORE_ADDR bp_addr, const target_waitstatus &ws) { - const struct signal_catchpoint *c - = (const struct signal_catchpoint *) bl->owner; + const signal_catchpoint *c + = gdb::checked_static_cast (bl->owner); gdb_signal signal_number; if (ws.kind () != TARGET_WAITKIND_STOPPED) diff --git a/gdb/break-catch-syscall.c b/gdb/break-catch-syscall.c index 9abf8183984..9bdfcf73efa 100644 --- a/gdb/break-catch-syscall.c +++ b/gdb/break-catch-syscall.c @@ -480,10 +480,10 @@ catch_syscall_enabled (void) static bool catching_syscall_number_1 (struct breakpoint *b, int syscall_number) { - if (is_syscall_catchpoint_enabled (b)) { - struct syscall_catchpoint *c = (struct syscall_catchpoint *) b; + syscall_catchpoint *c + = gdb::checked_static_cast (b); if (!c->syscalls_to_be_caught.empty ()) { -- 2.40.1