From patchwork Wed Oct 5 09:32:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 58377 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 2F512385AC2F for ; Wed, 5 Oct 2022 09:33:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2F512385AC2F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1664962433; bh=ThUupYlZWcvJFf5HCqNYyHu+TvqZeyazoMMbW1YFKL0=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=geZPowBftD4hKr26YPGzBLqZlNkx/YKk3+dHAXTYr707inYR43Td+CLysRZhSEmdt 7L+O238DgmA+qBJ9STTDtNo2Hx6DXMO+bHkoR+gzCLXws0BWnZ5lrGjXOCmo2TX762 JL2GKZARxwXhxopJNJ4MeqnOMUk3CihuNoScGhx8= 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 134C33857C72 for ; Wed, 5 Oct 2022 09:33:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 134C33857C72 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-17-VP_Fm2LCOLuuVVK5Z2uaGg-1; Wed, 05 Oct 2022 05:33:00 -0400 X-MC-Unique: VP_Fm2LCOLuuVVK5Z2uaGg-1 Received: by mail-wr1-f69.google.com with SMTP id j8-20020adfa548000000b0022e2bf8f48fso3428259wrb.23 for ; Wed, 05 Oct 2022 02:33:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=ThUupYlZWcvJFf5HCqNYyHu+TvqZeyazoMMbW1YFKL0=; b=GdgnZo57Onwci5tq0hfBmnSrwu9PqU8l+Rqz59sHI70gC8TvEfgNdP6vEj0Jr5q6Ds TTsKSEnz4r7O3HshrUkSH2olrjPS9THJgQWBGm85+lFmFwmc/iON9CrTWok8+PtvDv9x Zv7r4IeNeLzgBj8joOCth87Kz/wj0h7V1ls87+B45GzCt1UzM663UZOvtSaWKkpKB7Fr 44D0LjbWsa4rmtMIYGZFaW267qM2ycspdsQhqK/7jk7+ZAf5tnqweN7JWfkhmrObazhY tCMTMnzL2RJ8O0P3s6lT3FFOSbkiPtBw0XjWpIoT1zqFlLz+NwvuPX8yymLDcmdnh4HW +zSw== X-Gm-Message-State: ACrzQf39P/udGOVpdJoG23pnhnNdheUIPqwcOprt3jkKS3VBnnrl72Tx 8g8IN0qlY5ZUrxCSmdweefObNQCLtdGUep8iXHwiXlgJElkRlF4xg46ODTVUgtmAiDZjMC7/LXj hxYXwc/0VL4fRdEA3mQ1xrIr6jOkbHrXmxnTWVzlxjmfFEgx+xBqP29HcVT+1sotEqG9IfLN0iw == X-Received: by 2002:a5d:4cd0:0:b0:22e:4982:6fbe with SMTP id c16-20020a5d4cd0000000b0022e49826fbemr6318632wrt.591.1664962379116; Wed, 05 Oct 2022 02:32:59 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5sK1ZzLeKVRjJweUBcHzCvBKkTPmYFWoU9rbyBuLSVDCYgxrj9AvmbhSs5S8nytMDhWYCuqg== X-Received: by 2002:a5d:4cd0:0:b0:22e:4982:6fbe with SMTP id c16-20020a5d4cd0000000b0022e49826fbemr6318618wrt.591.1664962378911; Wed, 05 Oct 2022 02:32:58 -0700 (PDT) Received: from localhost (52.72.115.87.dyn.plus.net. [87.115.72.52]) by smtp.gmail.com with ESMTPSA id w10-20020a05600c474a00b003a5f54e3bbbsm1419918wmo.38.2022.10.05.02.32.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Oct 2022 02:32:58 -0700 (PDT) To: gdb-patches@sourceware.org Subject: [PATCH 3/4] gdb: make use of scoped_restore in unduplicated_should_be_inserted Date: Wed, 5 Oct 2022 10:32:51 +0100 Message-Id: <90be6d987ae6043fdb8c25a0706397ab06eaf437.1664962269.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=-12.2 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_LOW, 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.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Andrew Burgess via Gdb-patches From: Andrew Burgess Reply-To: Andrew Burgess Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" I noticed that we could make use of a scoped_restore in the function unduplicated_should_be_inserted. I've also converted the function return type from int to bool. This change shouldn't make any difference, as I don't think anything within should_be_inserted could throw an exception, but the change doesn't hurt, and will help keep us safe if anything ever changes in the future. --- gdb/breakpoint.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 57281a199b0..e3f3ba3efa6 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -2301,16 +2301,13 @@ should_be_inserted (struct bp_location *bl) /* Same as should_be_inserted but does the check assuming that the location is not duplicated. */ -static int +static bool unduplicated_should_be_inserted (struct bp_location *bl) { - int result; - const int save_duplicate = bl->duplicate; + scoped_restore restore_bl_duplicate + = make_scoped_restore (&bl->duplicate, 0); - bl->duplicate = 0; - result = should_be_inserted (bl); - bl->duplicate = save_duplicate; - return result; + return should_be_inserted (bl); } /* Parses a conditional described by an expression COND into an