LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Define _LIBCPP_SAFE_STATIC __attribute__((require_constant_initialization)), and apply it to memory_resource

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@280561 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier
2016-09-03 00:11:33 +00:00
parent 5f8cb58230
commit 766a31af3a
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/__config
View File

@@ -907,6 +907,12 @@ extern "C" void __sanitizer_annotate_contiguous_container(
#define _LIBCPP_HAS_THREAD_SAFETY_ANNOTATIONS #define _LIBCPP_HAS_THREAD_SAFETY_ANNOTATIONS
#endif #endif
#if __has_attribute(require_constant_initialization)
#define _LIBCPP_SAFE_STATIC __attribute__((__require_constant_initialization__))
#else
#define _LIBCPP_SAFE_STATIC
#endif
#endif // __cplusplus #endif // __cplusplus
#endif // _LIBCPP_CONFIG #endif // _LIBCPP_CONFIG

13
src/experimental/memory_resource.cpp
View File

@@ -70,7 +70,12 @@ union ResourceInitHelper {
}; };
// When compiled in C++14 this initialization should be a constant expression. // When compiled in C++14 this initialization should be a constant expression.
// Only in C++11 is "init_priority" needed to ensure initialization order. // Only in C++11 is "init_priority" needed to ensure initialization order.
ResourceInitHelper res_init __attribute__((init_priority (101))); #if _LIBCPP_STD_VER > 11
_LIBCPP_SAFE_STATIC
#else
__attribute__((init_priority (101)))
#endif
ResourceInitHelper res_init;
} // end namespace } // end namespace
@@ -89,7 +94,7 @@ static memory_resource *
__default_memory_resource(bool set = false, memory_resource * new_res = nullptr) _NOEXCEPT __default_memory_resource(bool set = false, memory_resource * new_res = nullptr) _NOEXCEPT
{ {
#ifndef _LIBCPP_HAS_NO_ATOMIC_HEADER #ifndef _LIBCPP_HAS_NO_ATOMIC_HEADER
static atomic<memory_resource*> __res = _LIBCPP_SAFE_STATIC static atomic<memory_resource*> __res =
ATOMIC_VAR_INIT(&res_init.resources.new_delete_res); ATOMIC_VAR_INIT(&res_init.resources.new_delete_res);
if (set) { if (set) {
new_res = new_res ? new_res : new_delete_resource(); new_res = new_res ? new_res : new_delete_resource();
@@ -102,7 +107,7 @@ __default_memory_resource(bool set = false, memory_resource * new_res = nullptr)
&__res, memory_order::memory_order_acquire); &__res, memory_order::memory_order_acquire);
} }
#elif !defined(_LIBCPP_HAS_NO_THREADS) #elif !defined(_LIBCPP_HAS_NO_THREADS)
static memory_resource * res = &res_init.resources.new_delete_res; _LIBCPP_SAFE_STATIC static memory_resource * res = &res_init.resources.new_delete_res;
static mutex res_lock; static mutex res_lock;
if (set) { if (set) {
new_res = new_res ? new_res : new_delete_resource(); new_res = new_res ? new_res : new_delete_resource();
@@ -115,7 +120,7 @@ __default_memory_resource(bool set = false, memory_resource * new_res = nullptr)
return res; return res;
} }
#else #else
static memory_resource* res = &res_init.resources.new_delete_res; _LIBCPP_SAFE_STATIC static memory_resource* res = &res_init.resources.new_delete_res;
if (set) { if (set) {
new_res = new_res ? new_res : new_delete_resource(); new_res = new_res ? new_res : new_delete_resource();
memory_resource * old_res = res; memory_resource * old_res = res;