From patchwork Wed Jan 15 21:37:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 104857 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 037C43860758 for ; Wed, 15 Jan 2025 21:39:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 037C43860758 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=D1+PJ0vE X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id AD102385140C for ; Wed, 15 Jan 2025 21:38:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AD102385140C Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org AD102385140C Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1736977092; cv=none; b=DxlYeEV0r4EwYq9NB60fi6A+R5lfZCXtiORgIVITxDi75fA4UOZYqlWEd7+t8clsPpd/FOjtVpUcajsnYuYSmJd0aFMCG+oRS1B0Hf5syYSdfDaBWbDXxcb+qtzkTu/zjl0tqwRURMq3kZyH/L0uDFj23w98dW8qNKs8yV0cVSg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1736977092; c=relaxed/simple; bh=itwxfXb7ahPO+8hvB/YVoB7Rk3RLoHz4yIV3In5fAb0=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=S5wRHoROqvNaPKAmXY7uCZO8F7YMuOPqUZjXWYiw3kP10+2xTVZ1Opt8FRuFF51kazN74x79IPq+0t5Y6/0UupH1d/Nyak/1hnfjv4GIgMQd08E3HA3GXebctmdwgGfjANEb9woBQE6G+wl6UT/vb4BCray8c4GikAeaLPbYdSk= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AD102385140C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1736977092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G89cnONPRLFgbM8wEnQ1gi1TaOioMy86GV33kCFkE1w=; b=D1+PJ0vELYS0PKmU9rXeN6ZvVI2cS6INqqumBWbORlL5scc8Pb1rGBz6CZPks/wBhniC18 z3vHu+c8zhBOcfl465IuXhJQpOqPQV8pRBerwOLVcJVooFhLnD0nzQrQHySKZL+qPCkasZ fgfkHOe2rP5GOvc0KyBSGcElorzR5Fo= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-314-FGEBI-NAOVGrMNqMQokH3w-1; Wed, 15 Jan 2025 16:38:11 -0500 X-MC-Unique: FGEBI-NAOVGrMNqMQokH3w-1 X-Mimecast-MFC-AGG-ID: FGEBI-NAOVGrMNqMQokH3w Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1ED70195608A; Wed, 15 Jan 2025 21:38:10 +0000 (UTC) Received: from localhost (unknown [10.42.28.2]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8F6A319560A3; Wed, 15 Jan 2025 21:38:09 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Fix reversed args in unreachable assumption [PR109849] Date: Wed, 15 Jan 2025 21:37:44 +0000 Message-ID: <20250115213808.1839448-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 7KC5uOFHRu6ud9qjD1yiyP6qoRUnoLBXwwY7iG2T1_U_1736977090 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-13.0 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_NONE, RCVD_IN_MSPIKE_H2, 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: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~patchwork=sourceware.org@gcc.gnu.org libstdc++-v3/ChangeLog: PR libstdc++/109849 * include/bits/vector.tcc (vector::_M_range_insert): Fix reversed args in length calculation. --- Tested x86_64-linux, pushed to trunk. Backport to gcc-14 to follow after testing. libstdc++-v3/include/bits/vector.tcc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libstdc++-v3/include/bits/vector.tcc b/libstdc++-v3/include/bits/vector.tcc index 44920a0549ab..4f4c366080be 100644 --- a/libstdc++-v3/include/bits/vector.tcc +++ b/libstdc++-v3/include/bits/vector.tcc @@ -934,7 +934,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER const size_type __len = _M_check_len(__n, "vector::_M_range_insert"); #if __cplusplus < 201103L - if (__len < (__n + (__old_start - __old_finish))) + if (__len < (__n + (__old_finish - __old_start))) __builtin_unreachable(); #endif