From patchwork Tue Feb 14 04:21:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 64939 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 7CC243858417 for ; Tue, 14 Feb 2023 04:22:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7CC243858417 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1676348531; bh=5zyKHuRJkBAifpLx+PPJvaa+Mq7OiYotWkFoUZauRhE=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=t78igutD1ND4O659TMIfFJekNMjJWUe8WQXDI58fB9Yte0rsSweXytdZ27tiSPZXo cBzGBWNPsjewCTMqrNEvjHBL+TZ95fX/GpIfq+T8sIEfSh3zbyPpNumnBzkKUoOxll BAHy7a7adsKhNT1XGFZJagBEqQxV3KA8gNQurjp8= 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 D70833858D33 for ; Tue, 14 Feb 2023 04:21:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D70833858D33 Received: from localhost.localdomain (unknown [217.28.27.60]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id 659DA1E221; Mon, 13 Feb 2023 23:21:41 -0500 (EST) To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 3/3] gdb: keep internalvars sorted Date: Mon, 13 Feb 2023 23:21:39 -0500 Message-Id: <20230214042139.73638-3-simon.marchi@efficios.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230214042139.73638-1-simon.marchi@efficios.com> References: <20230214042139.73638-1-simon.marchi@efficios.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1173.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_NONE, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_SOFTFAIL, 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: Simon Marchi via Gdb-patches From: Simon Marchi Reply-To: Simon Marchi Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" In a test (downstream in ROCgdb), there was a test case failing when GDB_REVERSE_INIT_FUNCTIONS was set. The test was assuming a particular order in the output of "show convenience". And the order changed with GDB_REVERSE_INIT_FUNCTIONS. I think that a nice way to fix it is to make the output of "show convenience" sorted, and therefore stable. Ideally, I think that the the user-visible behavior of GDB should not change when using GDB_REVERSE_INIT_FUNCTIONS. Plus, it makes the output of "show convenience" look nice, not that it's really important. So, change create_internalvar to keep the internalvars vector sorted. Change-Id: I3a916a641e0d50ff698f5d097ef0cf10637ab8de --- gdb/value.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gdb/value.c b/gdb/value.c index 68499896af8c..2c37f94cba99 100644 --- a/gdb/value.c +++ b/gdb/value.c @@ -1920,8 +1920,15 @@ complete_internalvar (completion_tracker &tracker, const char *name) struct internalvar * create_internalvar (const char *name) { - internalvars.emplace_back (new internalvar); - internalvar *var = internalvars.back ().get (); + auto it = std::lower_bound (internalvars.begin (), + internalvars.end (), + name, + [] (const internalvar_up &var, const char *name_) + { + return var->name < name_; + }); + + internalvar *var = internalvars.emplace (it, new internalvar)->get (); var->name = name; var->kind = INTERNALVAR_VOID;