| commit | 581b5447f18f4758a55b1fda4f8bf597e9466d40 | |
| author | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | |
| Wed, 31 Oct 2018 12:29:02 +0000 (31 12:29 +0000) | ||
| committer | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | |
| Wed, 31 Oct 2018 12:29:02 +0000 (31 12:29 +0000) | ||
| tree | 4f471c309277f6fc04dbe8187e6a65c5c91687f5 | treesnapshot (tar.gz zip) |
| parent | bd6d442a31bd0ea7c739d21698e480aa417c582e | commitdiff |
PR libstdc++/87822 fix layout change for nested std::pair
The introduction of the empty __pair_base base class for PR 86751
changed the layout of std::pair<std::pair<...>, ...>. The outer pair and
its first member both have a base class of the same type, which cannot
exist at the same address. This causes the first member to be at a
non-zero offset.
The solution is to make the base class depend on the template
parameters, so that each pair type has a different base class type,
which allows the base classes of the outer pair and its first member to
have the same address.
PR libstdc++/87822
* include/bits/stl_pair.h (__pair_base): Change to class template.
(pair): Make base class type depend on template parameters.
* testsuite/20_util/pair/87822.cc: New test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@265678 138bc75d-0d04-0410-961f-82ee72b054a4
The introduction of the empty __pair_base base class for PR 86751
changed the layout of std::pair<std::pair<...>, ...>. The outer pair and
its first member both have a base class of the same type, which cannot
exist at the same address. This causes the first member to be at a
non-zero offset.
The solution is to make the base class depend on the template
parameters, so that each pair type has a different base class type,
which allows the base classes of the outer pair and its first member to
have the same address.
PR libstdc++/87822
* include/bits/stl_pair.h (__pair_base): Change to class template.
(pair): Make base class type depend on template parameters.
* testsuite/20_util/pair/87822.cc: New test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@265678 138bc75d-0d04-0410-961f-82ee72b054a4
| libstdc++-v3/ChangeLog | diffblobblamehistory | |
| libstdc++-v3/include/bits/stl_pair.h | diffblobblamehistory | |
| libstdc++-v3/testsuite/20_util/pair/87822.cc | [new file with mode: 0644] | blob |