From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 48) id E5CCF3857B87; Wed, 17 Jan 2024 12:01:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E5CCF3857B87 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1705492884; bh=lVWIL5zEXOyMzwKnpBazLmE6+OmbQIQ4qPWPaMlwdHg=; h=From:To:Subject:Date:In-Reply-To:References:From; b=u1v0qjoI1CeYcHPDFLgbJkoWrZr/bfqIlqWiZSlTZhiMpr5YxLqiSSn3wYAHUjMlM AxMADy8zXp2DcFHVeuBHYofiFcpUP6+hiCfJmki9OdHYbHs5vVfO8khf+zerzU9LOD +Gj699r97fKO+4AYlqdQmccY5MbtCpApCXCYImks= From: "redi at gcc dot gnu.org" To: gcc-bugs@gcc.gnu.org Subject: [Bug libstdc++/111250] __glibcxx_requires_subscript assertions are not checked during constant evaluation Date: Wed, 17 Jan 2024 12:01:22 +0000 X-Bugzilla-Reason: CC X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: gcc X-Bugzilla-Component: libstdc++ X-Bugzilla-Version: 13.2.1 X-Bugzilla-Keywords: accepts-invalid X-Bugzilla-Severity: normal X-Bugzilla-Who: redi at gcc dot gnu.org X-Bugzilla-Status: NEW X-Bugzilla-Resolution: X-Bugzilla-Priority: P3 X-Bugzilla-Assigned-To: unassigned at gcc dot gnu.org X-Bugzilla-Target-Milestone: 15.0 X-Bugzilla-Flags: X-Bugzilla-Changed-Fields: Message-ID: In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Bugzilla-URL: http://gcc.gnu.org/bugzilla/ Auto-Submitted: auto-generated MIME-Version: 1.0 List-Id: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=3D111250 --- Comment #1 from Jonathan Wakely --- Something like this (with new/improved tests): --- a/libstdc++-v3/include/debug/assertions.h +++ b/libstdc++-v3/include/debug/assertions.h @@ -31,15 +31,16 @@ #include -#ifndef _GLIBCXX_ASSERTIONS -# define __glibcxx_requires_non_empty_range(_First,_Last) -# define __glibcxx_requires_nonempty() -# define __glibcxx_requires_subscript(_N) +#ifdef _GLIBCXX_DEBUG +# define __glibcxx_requires_non_empty_range(_First,_Last) \ + __glibcxx_check_non_empty_range(_First, _Last) +# define __glibcxx_requires_nonempty() __glibcxx_check_nonempty() +# define __glibcxx_requires_subscript(_N) __glibcxx_check_subscript(_N) #else - // Verify that [_First, _Last) forms a non-empty iterator range. # define __glibcxx_requires_non_empty_range(_First,_Last) \ __glibcxx_assert(_First !=3D _Last) +// Verify that N is a valid index into *this. # define __glibcxx_requires_subscript(_N) \ __glibcxx_assert(_N < this->size()) // Verify that the container is nonempty This change would use the more verbose, user-friendly assertions for the fu= ll debug mode, and unconditionally use __glibcxx_assert otherwise.=