From patchwork Tue Nov 28 17:36:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 80940 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 901313842FFD for ; Tue, 28 Nov 2023 17:37:03 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from simark.ca (simark.ca [158.69.221.121]) by sourceware.org (Postfix) with ESMTPS id 7247E3858287 for ; Tue, 28 Nov 2023 17:36:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7247E3858287 Authentication-Results: sourceware.org; dmarc=fail (p=none dis=none) header.from=efficios.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=efficios.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 7247E3858287 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=158.69.221.121 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701193010; cv=none; b=dibxEDf94qGeyQwtYC5PKvZGIv9n1SYvgCEgmgC501Vm6nnfaG45X5ir8bf2llLFRSOV+Qe0Wi/R+F7pJioFprdEh1Uica21+NUih2ojWQqisTi+DeZBt54S1Peej/+RlMnvb7VIUj8tpn0P2/LR/CVG2XHq0cHQl3ZSFLYm37s= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701193010; c=relaxed/simple; bh=M4gwdGSqI3dSk91BV5Yp1RrJmIkBVvfsVOyUOuhoGzE=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=ZjiGeK59RqCcFYeOb/EfyyqrtXWbCvC/da6j4KT03qDf8T1sK++mz/FzUXLah461f7cIav+GuD0BRKEEdArmAOdHcqdR0ETCmpneTZ6I1xNVrSnMB0e0wY5+zRzZi7v84JNSdiXLN20RriKlpLCpPbDXUJWk8s94qwscur1VjfU= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from smarchi-efficios.internal.efficios.com (192-222-143-198.qc.cable.ebox.net [192.222.143.198]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id 976351E091; Tue, 28 Nov 2023 12:36:47 -0500 (EST) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [pushed] gdb: fix call to breakpoint_inserted_here_p in darwin-nat.c Date: Tue, 28 Nov 2023 12:36:45 -0500 Message-ID: <20231128173646.300629-1-simon.marchi@efficios.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Spam-Status: No, score=-3496.7 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_NONE, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_SOFTFAIL, TXREP, T_SCC_BODY_TEXT_LINE 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 Fixes this issue, introduced by f9582a22dba7 ("[gdb] Fix segfault in for_each_block, part 1"): CXX darwin-nat.o /Users/smarchi/src/binutils-gdb/gdb/darwin-nat.c:1169:7: error: no matching function for call to 'breakpoint_inserted_here_p' if (breakpoint_inserted_here_p (inf->aspace, pc)) ^~~~~~~~~~~~~~~~~~~~~~~~~~ Change-Id: I3bb6be75b650319f0fa1dbdceb379b18531da96c --- gdb/darwin-nat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: 927d9ccfd30a5bdd7225cfd36a29d326653d9124 diff --git a/gdb/darwin-nat.c b/gdb/darwin-nat.c index f5624956e76f..d0073202ecba 100644 --- a/gdb/darwin-nat.c +++ b/gdb/darwin-nat.c @@ -1166,7 +1166,7 @@ darwin_nat_target::cancel_breakpoint (inferior *inf, ptid_t ptid) CORE_ADDR pc; pc = regcache_read_pc (regcache) - gdbarch_decr_pc_after_break (gdbarch); - if (breakpoint_inserted_here_p (inf->aspace, pc)) + if (breakpoint_inserted_here_p (inf->aspace.get (), pc)) { inferior_debug (4, "cancel_breakpoint for thread 0x%lx\n", (unsigned long) ptid.tid ());