diff options
Diffstat (limited to 'sys-devel/gcc')
| -rw-r--r-- | sys-devel/gcc/Manifest | 1 | ||||
| -rw-r--r-- | sys-devel/gcc/files/gcc-13-PR109703-unreachable.patch | 54 |
2 files changed, 0 insertions, 55 deletions
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest index 766754d69fdb..cd15bbd3dda6 100644 --- a/sys-devel/gcc/Manifest +++ b/sys-devel/gcc/Manifest @@ -1,4 +1,3 @@ -AUX gcc-13-PR109703-unreachable.patch 2316 BLAKE2B f7ffc76f5fd78076855e57b08d2a727b7d555d3b53fc93c63cae1034e5bdc9dc2bc9a867e291d0905e550dfb11403e0c723bc0f2461b0180cb39b3fa1d332a1e SHA512 f3087b536353388ca98ef6d73d3acca1adcb87eea21f27d035c755a1c15ac0fb78fb60fd3283d3d7b60cfadfd6d97cf1c04085ea992135d2e6a4a84b0b5084da AUX gcc-13-fix-cross-fixincludes.patch 792 BLAKE2B f16dcfee5760380931642520bf7ae939a22131183dec4f9515cabeabaa2eafbc339d4f8bdc0605bda45d840876cb8720264c4612d99510b4d7a2e4132db2403e SHA512 d65061e07c5f3089a9d39edafed94c39082dbb254cfebb386fa2fce5374e54e3e1e15a84f0de96adbe1c5ebfc33a5dad10ecbd3db851f852ec1a7521b8940fc5 AUX gcc-configure-LANG.patch 2052 BLAKE2B 28c36f4992e41305ee421dade5eaaac34e3bdc523665b03f360f2bc01e8f69e9dc48052edb80dece63ab561e80325b4f125502482eb16f7324f1c03670021550 SHA512 a694c7ac2f45cc657097ff5b0cf1356ac88a9c06035c9ba15167e9d444844d0d8a478eb1b9b62195dd063774f79697b9148b9cdb6c261640b472c291061b2129 AUX gcc-configure-texinfo.patch 341 BLAKE2B d2ea3b2ea08f5d3a498ba27d0fb95e325097e2104e55caa28b66515cb48662649140d90b639369aedc54b2b1178fa4b49cda442f5f504e09d88a2efa45a5057c SHA512 e8d34c5077409df5495cf0c5fbf5e77f841c5698108fa6a5fde33eb28202c685603bdefd8368918e55f30c4b995e895d71d64c715c1ec2b017e09eb2c54c09ff diff --git a/sys-devel/gcc/files/gcc-13-PR109703-unreachable.patch b/sys-devel/gcc/files/gcc-13-PR109703-unreachable.patch deleted file mode 100644 index f7c7c9f60a70..000000000000 --- a/sys-devel/gcc/files/gcc-13-PR109703-unreachable.patch +++ /dev/null @@ -1,54 +0,0 @@ -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=109703 - -From d50f2599d7b23bdba05a9102645d082ed9bcb05f Mon Sep 17 00:00:00 2001 -From: Kefu Chai <kefu.chai@scylladb.com> -Date: Mon, 1 May 2023 21:24:26 +0100 -Subject: [PATCH] libstdc++: Set _M_string_length before calling _M_dispose() - [PR109703] - -This always sets _M_string_length in the constructor for ranges of input -iterators, such as stream iterators. - -We copy from the source range to the local buffer, and then repeatedly -reallocate a larger one if necessary. When disposing the old buffer, -_M_is_local() is used to tell if the buffer is the local one or not (and -so must be deallocated). In addition to comparing the buffer address -with the local buffer, _M_is_local() has an optimization hint so that -the compiler knows that for a string using the local buffer, there is an -invariant that _M_string_length <= _S_local_capacity (added for PR109299 -via r13-6915-gbf78b43873b0b7). But we failed to set _M_string_length in -the constructor taking a pair of iterators, so the invariant might not -hold, and __builtin_unreachable() is reached. This causes UBsan errors, -and potentially misoptimization. - -To ensure the invariant holds, _M_string_length is initialized to zero -before doing anything else, so that _M_is_local() doesn't see an -uninitialized value. - -This issue only surfaces when constructing a string with a range of -input iterator, and the uninitialized _M_string_length happens to be -greater than _S_local_capacity, i.e., 15 for the std::string -specialization. - -libstdc++-v3/ChangeLog: - - PR libstdc++/109703 - * include/bits/basic_string.h (basic_string(Iter, Iter, Alloc)): - Initialize _M_string_length. - -Signed-off-by: Kefu Chai <kefu.chai@scylladb.com> -Co-authored-by: Jonathan Wakely <jwakely@redhat.com> -(cherry picked from commit cbf6c7a1d16490a1e63e9a5ce00e9a5c44c4c2f2) ---- a/libstdc++-v3/include/bits/basic_string.h -+++ b/libstdc++-v3/include/bits/basic_string.h -@@ -760,7 +760,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 - _GLIBCXX20_CONSTEXPR - basic_string(_InputIterator __beg, _InputIterator __end, - const _Alloc& __a = _Alloc()) -- : _M_dataplus(_M_local_data(), __a) -+ : _M_dataplus(_M_local_data(), __a), _M_string_length(0) - { - #if __cplusplus >= 201103L - _M_construct(__beg, __end, std::__iterator_category(__beg)); --- -2.31.1 |