[gcc r13-6915] libstdc++: Tell GCC what basic_string::_M_is_local() means [PR109299]
Jonathan Wakely
redi@gcc.gnu.org
Tue Mar 28 20:14:20 GMT 2023
https://gcc.gnu.org/g:bf78b43873b0b7e8f9a430df38749b8b61f9c9b8
commit r13-6915-gbf78b43873b0b7e8f9a430df38749b8b61f9c9b8
Author: Jonathan Wakely <jwakely@redhat.com>
Date: Tue Mar 28 10:50:40 2023 +0100
libstdc++: Tell GCC what basic_string::_M_is_local() means [PR109299]
This avoids a bogus warning about overflowing a buffer, because GCC
can't tell that we don't copy into the buffer unless it fits. By adding
a __builtin_unreachable() hint we inform the compiler about the
invariant that the buffer is only used when it's big enough.
This can also improve codegen, by eliminating dead code that GCC
couldn't tell was unreachable.
libstdc++-v3/ChangeLog:
PR libstdc++/109299
* include/bits/basic_string.h (basic_string::_M_is_local()): Add
hint for compiler that local strings fit in the local buffer.
Diff:
---
libstdc++-v3/include/bits/basic_string.h | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h
index 1b8ebca7dad..5d040e2897d 100644
--- a/libstdc++-v3/include/bits/basic_string.h
+++ b/libstdc++-v3/include/bits/basic_string.h
@@ -271,7 +271,15 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11
_GLIBCXX20_CONSTEXPR
bool
_M_is_local() const
- { return _M_data() == _M_local_data(); }
+ {
+ if (_M_data() == _M_local_data())
+ {
+ if (_M_string_length > _S_local_capacity)
+ __builtin_unreachable();
+ return true;
+ }
+ return false;
+ }
// Create & Destroy
_GLIBCXX20_CONSTEXPR
More information about the Libstdc++-cvs
mailing list