diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 8 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/functional | 13 | ||||
| -rw-r--r-- | libstdc++-v3/include/tr1/functional | 13 |
3 files changed, 14 insertions, 20 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 0af8ae6..b6a0b1e 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2010-05-27 Jason Merrill <jason@redhat.com> + + Revert: + PR libstdc++/42832 + * include/std/functional (function<>::swap): Perform bytewise + swap of _M_functor. + * include/tr1/functional (function<>::swap): Likewise. + 2010-05-27 Paolo Carlini <paolo.carlini@oracle.com> PR libstdc++/40497 diff --git a/libstdc++-v3/include/std/functional b/libstdc++-v3/include/std/functional index 7f6d8b6..b6cc6d5 100644 --- a/libstdc++-v3/include/std/functional +++ b/libstdc++-v3/include/std/functional @@ -1948,16 +1948,9 @@ namespace std */ void swap(function& __x) { - /* We cannot perform direct assignments of the _M_functor - parts as they are of type _Any_data and have a different - dynamic type. Doing so would violate type-based aliasing - rules and lead to spurious miscompilations. - Instead perform a bytewise exchange of the memory of - both POD objects. - ??? A wordwise exchange honoring alignment of _M_functor - would be more efficient. See PR42845. */ - for (unsigned i = 0; i < sizeof (_M_functor._M_pod_data); ++i) - std::swap (_M_functor._M_pod_data[i], __x._M_functor._M_pod_data[i]); + _Any_data __old_functor = _M_functor; + _M_functor = __x._M_functor; + __x._M_functor = __old_functor; _Manager_type __old_manager = _M_manager; _M_manager = __x._M_manager; __x._M_manager = __old_manager; diff --git a/libstdc++-v3/include/tr1/functional b/libstdc++-v3/include/tr1/functional index ae080bb..3340de6 100644 --- a/libstdc++-v3/include/tr1/functional +++ b/libstdc++-v3/include/tr1/functional @@ -1907,16 +1907,9 @@ namespace tr1 */ void swap(function& __x) { - /* We cannot perform direct assignments of the _M_functor - parts as they are of type _Any_data and have a different - dynamic type. Doing so would violate type-based aliasing - rules and lead to spurious miscompilations. - Instead perform a bytewise exchange of the memory of - both POD objects. - ??? A wordwise exchange honoring alignment of _M_functor - would be more efficient. See PR42845. */ - for (unsigned i = 0; i < sizeof (_M_functor._M_pod_data); ++i) - std::swap (_M_functor._M_pod_data[i], __x._M_functor._M_pod_data[i]); + _Any_data __old_functor = _M_functor; + _M_functor = __x._M_functor; + __x._M_functor = __old_functor; _Manager_type __old_manager = _M_manager; _M_manager = __x._M_manager; __x._M_manager = __old_manager; |