From patchwork Mon Jul 22 14:42:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 94321 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 40CB4385DDCA for ; Mon, 22 Jul 2024 14:43:28 +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 96CBD3858401 for ; Mon, 22 Jul 2024 14:42:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 96CBD3858401 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 96CBD3858401 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=1721659382; cv=none; b=pvRlKSl9Vd2XD6G++FspWoPxFzdqOfry+OHkjsU3sa73YoH4Ml/fhyo68AVUn1V+Cs3wJinBg2XYu8iJclvjJ8mBQEhDIkFbPGqakkZGmesrrb9vkEfeGqzcgZqFfbVe/1jz8+AiwulEiXzF4HmQ5W8IohHPu/zSYK1AsWbw2DY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1721659382; c=relaxed/simple; bh=2OfRxQQcICgpWHBG36yNPCZRwv4EP7PozP5Nf3aLQyc=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=syEaxWOR1lzrsdDgf1JbYrzk2FWupnO3hp/PRKWeS9v/1k2bU9huY/QjLs2SjoGD4bTC80cNzATauI8GAgxNqERzEUVS/PRyPWc6haZUzHr/J+zdIbIkTn841GtFCZiGRsEj2EVpLm58kJDM5brdfN9eacX4w0d7C7MgDTlE/A4= 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 127751E0C3; Mon, 22 Jul 2024 10:42:56 -0400 (EDT) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH] gdb/solib-frv: move lm_info object to solib Date: Mon, 22 Jul 2024 10:42:49 -0400 Message-ID: <20240722144254.52739-1-simon.marchi@efficios.com> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-Spam-Status: No, score=-3496.3 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.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 I noticed that the lm_info_frv objects created in frv_current_sos are never moved to the solib object. This bug was introduced in 8971d2788e ("gdb: link so_list using intrusive_list"), which mistakenly removed the line sop->lm_info = std::move (li); ... probably due so a bad merge conflict resolution. Re-add this line. If merged in master, I would cherry-pick this to gdb-15-branch. Change-Id: I609a1a5ad39e93f70a95ea5ebe3f8ff4ab6a8db2 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=32005 --- gdb/solib-frv.c | 2 ++ 1 file changed, 2 insertions(+) base-commit: 6fc24c7607ba54a2fc3e2a947de26bc25d42cbe3 diff --git a/gdb/solib-frv.c b/gdb/solib-frv.c index 79052db86f82..f84ff89ffe09 100644 --- a/gdb/solib-frv.c +++ b/gdb/solib-frv.c @@ -382,6 +382,8 @@ frv_current_sos () li->map = loadmap; li->got_value = got_addr; li->lm_addr = lm_addr; + sop->lm_info = std::move (li); + /* Fetch the name. */ addr = extract_unsigned_integer (lm_buf.l_name, sizeof (lm_buf.l_name),