From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-io1-xd2b.google.com (mail-io1-xd2b.google.com [IPv6:2607:f8b0:4864:20::d2b]) by sourceware.org (Postfix) with ESMTPS id 5102F3858C41 for ; Wed, 24 Jan 2024 15:48:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5102F3858C41 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 5102F3858C41 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::d2b ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706111337; cv=none; b=pUkPcfom66yA89T3/IfiLpruz2MN969EEGjnheJt2e2nnB+4Ju2cJ3s00BqSZoizrQpRCSivv2r8RBZBGMMwNBH6lA+LWo1zzTHsFCkc6epOSXipHLAQGb1UXuGoogiWH9WPfPMBR4e1aMUu0ivVwjdLVihumbGenjS22pOpOWk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706111337; c=relaxed/simple; bh=S8mAhoqLO9S0sElRSI5tiHMkhwKb6zi1/do0M1lXTwI=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=K3swBQISs9MgZEDwN8DBA7yWV46/p/i1xA5hnwCOQYae5OqOuM3xgsEz269tKPff/IyK8UVcKBfRbIOHDNzdF7MyrfeL+qJ9Xp3aCE7m5KZF7d0kmaTa8VSYrgRYNJJuiZ7t2xojW8tT/7UBPZavvLgf8QgXtvtB16idWml92F0= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-io1-xd2b.google.com with SMTP id ca18e2360f4ac-7beda2e6794so138766439f.1 for ; Wed, 24 Jan 2024 07:48:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1706111335; x=1706716135; darn=sourceware.org; h=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=doqBiIoTjC7bzUEBa95sIaUsVxWKfObzHRhcrl3vxSw=; b=lBKdTe8YUesAne7OIKp1q+pgTWfzMZN712446QVmK9szMw3TW8wqmTYXnzXejR8xDj Xz6ZvxfdPBFcvHYYf1P7y/ZL06O0XkisbxrQxqigMx3Bt3GXQ4A4g1AZXvsdVESz1MFN 1MKCUZxVDXJD17LhggTnlD/ub3KOAo+GRXNgFATrfhFDTM26mmijzI0H6TX9v9J/wpjM bRIuH0h4a6wuQm90Tq9FopYayd8YGgiWaDgEWJpTQPyHEY5MwAxurnoOjsyi/qE10Qfg KWIE5oOqaX7DBobwpZoBzsRyuFfu821/WJxUGyJwrQBTjN+tG43cUwWrJOotM2eRFuUK 7Uvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706111335; x=1706716135; h=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=doqBiIoTjC7bzUEBa95sIaUsVxWKfObzHRhcrl3vxSw=; b=ZizJo4KSiIdC2n+6jKArPjkxNWsLK26zjBO3sWbdhed9uJTvomp2EKsItboW9hZieZ YWG/ZLNid2A51NTqoFIW1nEwLAsMmP3nYEYkvYs6oMjkSCBXMvbt2ltThubq2ZAEfUrI W9G/J1spdFT+A2Dx9q4nCQYAuVBaYJu/PQZkAnonN+qrrv6HOdqPIywlNfsJrviVJcX/ jLL5JzhlAwFwQqRg9YOTeWWcgpOlEonAZvlGiNYisEbMyoZlM/IL7ZFUSyknzUVTUjLO w1kPW5dZXZez7hFWxZIGFVNzQp9PGax42F7Zbdko/4Dp9z9M1mWTFSZNCuARHb94o/rP kGLQ== X-Gm-Message-State: AOJu0Yxxl4hbdcajtXVAfkgZtd2tm6Xn3X9B8v5dRYdhDH3oXUYacrMc VQr5TmOG77Pn38TMsSJZ5MHGgUCt1/kBQeqB92MPEa1yqcOI+HfvPmFNcovURytc4QPxbBgRp8k = X-Google-Smtp-Source: AGHT+IEp/VktX6QlhYOnD+TmUHYNnY29Ot2LT7eRFFRV022ijaER7SG6+3q1KdzKqeWi56IDjRhkSA== X-Received: by 2002:a6b:3c0e:0:b0:7bf:6f65:2bab with SMTP id k14-20020a6b3c0e000000b007bf6f652babmr1023363iob.7.1706111335593; Wed, 24 Jan 2024 07:48:55 -0800 (PST) Received: from localhost.localdomain (97-122-68-157.hlrn.qwest.net. [97.122.68.157]) by smtp.gmail.com with ESMTPSA id h5-20020a6b7845000000b007ba783a27c3sm6972526iop.11.2024.01.24.07.48.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jan 2024 07:48:55 -0800 (PST) From: Tom Tromey Date: Wed, 24 Jan 2024 08:48:54 -0700 Subject: [PATCH 2/3] Clean up suppress_new_breakpoint_event MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20240124-dap-launch-fix-v1-2-0d47f87fa9f0@adacore.com> References: <20240124-dap-launch-fix-v1-0-0d47f87fa9f0@adacore.com> In-Reply-To: <20240124-dap-launch-fix-v1-0-0d47f87fa9f0@adacore.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.4 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,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 List-Id: Kévin pointed out that suppress_new_breakpoint_event would do the wrong thing if it happened to be used reentrantly. While I don't think this can happen, it's also easy and clearly better to make it robust. --- gdb/python/lib/gdb/dap/breakpoint.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gdb/python/lib/gdb/dap/breakpoint.py b/gdb/python/lib/gdb/dap/breakpoint.py index 9cbd7ae0c47..87e746472fb 100644 --- a/gdb/python/lib/gdb/dap/breakpoint.py +++ b/gdb/python/lib/gdb/dap/breakpoint.py @@ -47,11 +47,12 @@ _suppress_bp = False def suppress_new_breakpoint_event(): """Return a new context manager that suppresses new breakpoint events.""" global _suppress_bp + saved = _suppress_bp _suppress_bp = True try: yield None finally: - _suppress_bp = False + _suppress_bp = saved @in_gdb_thread -- 2.43.0