diff options
| author | Tim Song <t.canens.cpp@gmail.com> | 2023-09-06 19:31:55 +0200 |
|---|---|---|
| committer | François Dumont <fdumont@gcc.gnu.org> | 2023-10-02 22:47:58 +0200 |
| commit | e6d26b141bf03a0348b51e4778c79d44dc760eed (patch) | |
| tree | 5e67893b0fd201a0673d6db0bcea07d74be7ebd7 | |
| parent | 3ac5ed3719942b8c98e149328603033ce5c61103 (diff) | |
libstdc++: Force _Hash_node_value_base methods inline to fix abi (PR111050)
https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=1b6f0476837205932613ddb2b3429a55c26c409d
changed _Hash_node_value_base to no longer derive from _Hash_node_base, which means
that its member functions expect _M_storage to be at a different offset. So explosions
result if an out-of-line definition is emitted for any of the member functions (say,
in a non-optimized build) and the resulting object file is then linked with code built
using older version of GCC/libstdc++.
libstdc++-v3/ChangeLog:
PR libstdc++/111050
* include/bits/hashtable_policy.h
(_Hash_node_value_base<>::_M_valptr(), _Hash_node_value_base<>::_M_v())
Add [[__gnu__::__always_inline__]].
(cherry picked from commit 2c1e3544a94c5d7354fad031e1f9731c3ce3af25)
| -rw-r--r-- | libstdc++-v3/include/bits/hashtable_policy.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libstdc++-v3/include/bits/hashtable_policy.h b/libstdc++-v3/include/bits/hashtable_policy.h index cce4e2844cf..2f79394d89e 100644 --- a/libstdc++-v3/include/bits/hashtable_policy.h +++ b/libstdc++-v3/include/bits/hashtable_policy.h @@ -327,18 +327,22 @@ namespace __detail __gnu_cxx::__aligned_buffer<_Value> _M_storage; + [[__gnu__::__always_inline__]] _Value* _M_valptr() noexcept { return _M_storage._M_ptr(); } + [[__gnu__::__always_inline__]] const _Value* _M_valptr() const noexcept { return _M_storage._M_ptr(); } + [[__gnu__::__always_inline__]] _Value& _M_v() noexcept { return *_M_valptr(); } + [[__gnu__::__always_inline__]] const _Value& _M_v() const noexcept { return *_M_valptr(); } |