From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id sDnkDgGqimfEnxIAWB0awg (envelope-from ) for ; Fri, 17 Jan 2025 14:05:37 -0500 Authentication-Results: simark.ca; dkim=pass (2048-bit key; secure) header.d=adacore.com header.i=@adacore.com header.a=rsa-sha256 header.s=google header.b=ZElsrE8t; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 392351E100; Fri, 17 Jan 2025 14:05:37 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-5.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham autolearn_force=no version=4.0.0 Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (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 ESMTPS id CC0501E05C for ; Fri, 17 Jan 2025 14:05:36 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7C97B383F866 for ; Fri, 17 Jan 2025 19:05:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7C97B383F866 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, secure) header.d=adacore.com header.i=@adacore.com header.a=rsa-sha256 header.s=google header.b=ZElsrE8t Received: from mail-io1-xd34.google.com (mail-io1-xd34.google.com [IPv6:2607:f8b0:4864:20::d34]) by sourceware.org (Postfix) with ESMTPS id 606A9383F84B for ; Fri, 17 Jan 2025 19:05:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 606A9383F84B 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 606A9383F84B Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::d34 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1737140704; cv=none; b=ufFSWJBpZvFYZT+bT7xEWstDfLTIsgFRV83nudJ+Z4NN96V291i3njpd1ttTlwHJ2E1UlDcqk/zt3XL07A5Bch/b1Wdulw0UpqXLeBOLFKcuUx0mT5Tg7Ie7pr13q7HRR3CdYq6T+nWu7bxOKE4tsA0g0sIrPhSYVPbTZaXJnHg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1737140704; c=relaxed/simple; bh=L6x7tSzNcNkw6OKcaIf+BiNV/GIHqeEEu/cOqYSsnkE=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=RQl2WGexzwQcU3zNOwD9GzChjk87o89gGSeC0p3r7vwtUcctlhWgdlwvSwkmXRpOzC5I/W1g46baNNcJnTTvNiFspLJsuUPDt7jJ15Urc+Ei9wakFcQvB85xSPpEpnyQRjC90pgriIStWvTamoKJBBcp0InO1y2K/acQ0H7gv/k= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 606A9383F84B Received: by mail-io1-xd34.google.com with SMTP id ca18e2360f4ac-844e12f702dso71810839f.3 for ; Fri, 17 Jan 2025 11:05:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1737140703; x=1737745503; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=SMhbHu82TgcJ0OJqmtVhvPlj6P9rPiVMhQnvCvmbR4M=; b=ZElsrE8ts7lTIFHNfqLCDriP2K0RM5lBfBfSBsE1CY8+GHxOkFgCqCXy7gCspoANpp sfa74UttA1cgPRWJwVb5ZuAisoIlto5tvlxgzzsZ3Gag0+JqLQ/+TR32055L2+BbVM+e v331ZRGyFN3XhlmGoy3jwBHdTrtFPbpggU4eAL5cU4lJXESZHS4dJg87qs4GlQ1l6UXU 0PtiCN0F8mT8k7ngqzH0MGW28pIVBOm/s5JQlawt6FcQzRJ2ztpvZ99WcYz2mB6EhIEq a8xMcJYOlEOpPPNiIckVRQyjsCEF/o+FICgCKjaqjVAzeOC1lvLtmOlOnQ+bsYvUkhh2 IE9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737140703; x=1737745503; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=SMhbHu82TgcJ0OJqmtVhvPlj6P9rPiVMhQnvCvmbR4M=; b=fGEr5Uu/CpF62mLjG1QzJw2tqJeW7T9I5KAgGXBJDnKFcmWFN4gRXEkNh50yAaY+XP 4MHDS06WXifON8RmBD67mtV0GUxhL8fi5rMYtWQvS8fSH0d1Hs6WxHStI8vjZYHoSJr8 u3AzB3KUPZgrsTZyzFkrtO9qtfkpa+Dq0zSiUmKE645cV/D2XwcVAlET7RXi4hmCs/Ix uKKBa9BulmOeCAlXRKcF1GDJTzVya2SC4tyTd4sqrPnb21LSaFOQb/9bJEJAO0gzpbat auvPSZO86lwxedogx+cucDkNIpCHzN4zSe2twz105YY6rMl9Gg/BAuqm9LL4quZQYDm/ bqow== X-Gm-Message-State: AOJu0Yx+R/hu3MUPhNPhaX4uVVa2e/8aqJfwUU8mbEGk9r4PYp+c6alQ j7i77DjF1VhXZTpOFeko3zknX0oRAdyroZVge+8ibF5xW5B2dgM60Rv/ZT7zFOLezoJrYZB735c = X-Gm-Gg: ASbGncuvOhpKyg21GxFhSM9cdiGPaqM7OcbE0skGYdp2lwJppsKmz/dkWM8KKzayJlF 2zOOPattsZ7BjBk4u4tLfJMf/p0ro0ezXpddA5EN3RJGjJ3U9zJIZ9yANXJdvxajbFDF12SEbmd p+yWpsIYde0etR9nbG8F+S3dkbOfXn0hwqTdbN4GfgXrux8a9xRxZleYGe6KctDywt4myTU43fT shqc8e9JEVFHuGZAZHcQR4wjn37xxDoHaZAqljVippe+m+6LHwVhcaPSzJGM2Tc6oxPqiNqOar1 6P3mgrN8rFrNq+K6bJrI X-Google-Smtp-Source: AGHT+IHoq6ZYv26+DCOUbH5pZGba81DqJxCmrRW3Krw46XKmgo8oN31buXJ6BghkSMNZXK/GUU33LA== X-Received: by 2002:a05:6602:3f0c:b0:84a:5280:5a15 with SMTP id ca18e2360f4ac-851b618ba61mr361190239f.5.1737140703660; Fri, 17 Jan 2025 11:05:03 -0800 (PST) Received: from localhost.localdomain (97-118-36-154.hlrn.qwest.net. [97.118.36.154]) by smtp.gmail.com with ESMTPSA id ca18e2360f4ac-851b04fc2e2sm72499439f.42.2025.01.17.11.05.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jan 2025 11:05:03 -0800 (PST) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH] Simplify get_frame_unwind_table Date: Fri, 17 Jan 2025 12:04:53 -0700 Message-ID: <20250117190453.1405884-1-tromey@adacore.com> X-Mailer: git-send-email 2.47.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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~public-inbox=simark.ca@sourceware.org This simplifies get_frame_unwind_table, changing it to use the registry 'emplace' method and to pass the initialization iterators to the constructor. This fixes a build problem on x86 -- reported by the auto-builder -- as a side effect. --- gdb/frame-unwind.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/gdb/frame-unwind.c b/gdb/frame-unwind.c index fab9b3c981a..33b23f91feb 100644 --- a/gdb/frame-unwind.c +++ b/gdb/frame-unwind.c @@ -73,15 +73,10 @@ static std::vector & get_frame_unwind_table (struct gdbarch *gdbarch) { std::vector *table = frame_unwind_data.get (gdbarch); - if (table != nullptr) - return *table; - - table = new std::vector; - table->insert (table->begin (), standard_unwinders.begin (), - standard_unwinders.end ()); - - frame_unwind_data.set (gdbarch, table); - + if (table == nullptr) + table = frame_unwind_data.emplace (gdbarch, + standard_unwinders.begin (), + standard_unwinders.end ()); return *table; } -- 2.47.1