aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Pinski <quic_apinski@quicinc.com>2025-02-13 14:10:06 -0800
committerAndrew Pinski <quic_apinski@quicinc.com>2025-02-14 15:10:43 -0800
commit0c3cc57f0e71a7a945fb10c817260dd8a7894e7f (patch)
tree78693e035f81091fc2b81e3db14870e5a18f96ca
parent8e44f7ecb7b9ad6893f7784b1a303a5463b46cd5 (diff)
downloadgcc-0c3cc57f0e71a7a945fb10c817260dd8a7894e7f.zip
gcc-0c3cc57f0e71a7a945fb10c817260dd8a7894e7f.tar.gz
gcc-0c3cc57f0e71a7a945fb10c817260dd8a7894e7f.tar.bz2
libstdc++: Improve list assumption after constructor [PR118865]
The code example here does: ``` if (begin == end) __builtin_unreachable(); std::list nl(begin, end); for (auto it = nl.begin(); it != nl.end(); it++) { ... } /* Remove the first element of the list. */ nl.erase(nl.begin()); ``` And we get a warning because because we jump threaded the case were we think the list was empty from the for loop BUT we populated it without an empty array. So can help the compiler here by adding that after initializing the list with non empty array, that the list will not be empty either. This is able to remove the -Wfree-nonheap-object warning in the first reduced testcase (with the fix for `begin == end` case added) in the PR 118865; the second reduced testcase has been filed off as PR 118867. Bootstrapped and tested on x86_64-linux-gnu. libstdc++-v3/ChangeLog: PR libstdc++/118865 * include/bits/stl_list.h (_M_initialize_dispatch): Add an unreachable if the iterator was not empty that the list will now be not empty. Signed-off-by: Andrew Pinski <quic_apinski@quicinc.com>
-rw-r--r--libstdc++-v3/include/bits/stl_list.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/libstdc++-v3/include/bits/stl_list.h b/libstdc++-v3/include/bits/stl_list.h
index be33eeb..f987d8b 100644
--- a/libstdc++-v3/include/bits/stl_list.h
+++ b/libstdc++-v3/include/bits/stl_list.h
@@ -2384,12 +2384,18 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11
_M_initialize_dispatch(_InputIterator __first, _InputIterator __last,
__false_type)
{
+ bool __notempty = __first != __last;
for (; __first != __last; ++__first)
#if __cplusplus >= 201103L
emplace_back(*__first);
#else
push_back(*__first);
#endif
+ if (__notempty)
+ {
+ if (begin() == end())
+ __builtin_unreachable();
+ }
}
// Called by list(n,v,a), and the range constructor when it turns out