From c386686921f2eecb9f1a419def40b6b55732da98 Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Thu, 9 Oct 2014 19:17:28 +0100
Subject: [PATCH] re PR libstdc++/61909 (Small function optimization not
applied to small objects)
PR libstdc++/61909
* include/std/functional (__is_location_invariant): Treat all
trivially copyable types as location invariant.
From-SVN: r216047
---
libstdc++-v3/ChangeLog | 4 ++++
libstdc++-v3/include/std/functional | 5 +++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 6b4444aa2c56..69ec7fff36d9 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -7,6 +7,10 @@
* include/std/atomic (atomic): Add assertion for trivially copyable.
* testsuite/29_atomics/atomic/60695.cc: Adjust line number.
+ PR libstdc++/61909
+ * include/std/functional (__is_location_invariant): Treat all
+ trivially copyable types as location invariant.
+
2014-10-09 Ville Voutilainen <ville.voutilainen@gmail.com>
PR libstdc++/60132
diff --git a/libstdc++-v3/include/std/functional b/libstdc++-v3/include/std/functional
index 15247bf41d92..bed1eea018f6 100644
--- a/libstdc++-v3/include/std/functional
+++ b/libstdc++-v3/include/std/functional
@@ -1743,11 +1743,12 @@ _GLIBCXX_HAS_NESTED_TYPE(result_type)
/**
* Trait identifying "location-invariant" types, meaning that the
* address of the object (or any of its members) will not escape.
- * Also implies a trivial copy constructor and assignment operator.
+ * Trivially copyable types are location-invariant and users can
+ * specialize this trait for other types.
*/
template<typename _Tp>
struct __is_location_invariant
- : __or_<is_pointer<_Tp>, is_member_pointer<_Tp>>::type
+ : is_trivially_copyable<_Tp>::type
{ };
class _Undefined_class;
--
GitLab