From e2d17845973714cda3e828c16131f245dd82b2b6 Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Fri, 16 Feb 2018 01:13:15 -0800 Subject: Changes imported from Abseil "staging" branch: - db6fa2aed56380c6708670659c6f8603284fcc4a Rework Abseil cmake/README.md by Abseil Team - 192c7d3553bc0fe98f6935ccecff48ed785d89f0 Add function attribute ABSL_ATTRIBUTE_FUNC_ALIGN(bytes) t... by Abseil Team - 1a93e95c71c656add346a0c1771bec26417347ad Internal change by Abseil Team - 5c6d3e023a8749a5cc89f4cc6b57b6684a28b1c1 Internal change by Shaindel Schwartz - e415990ea54cf882646b0bc0a75a6e3c6741ce5f Fix testing of UTF8 characters on Windows (https://github... by Abseil Team GitOrigin-RevId: db6fa2aed56380c6708670659c6f8603284fcc4a Change-Id: I128a7ca751fa207ef272809c1b908568d187c87e --- absl/base/internal/malloc_hook.cc | 1 + 1 file changed, 1 insertion(+) (limited to 'absl/base/internal') diff --git a/absl/base/internal/malloc_hook.cc b/absl/base/internal/malloc_hook.cc index 780e8fe3296c..e7b626df125b 100644 --- a/absl/base/internal/malloc_hook.cc +++ b/absl/base/internal/malloc_hook.cc @@ -437,6 +437,7 @@ static inline bool InHookCaller(const void* caller) { return ADDR_IN_ATTRIBUTE_SECTION(caller, google_malloc) || ADDR_IN_ATTRIBUTE_SECTION(caller, malloc_hook) || ADDR_IN_ATTRIBUTE_SECTION(caller, blink_malloc); + // We can use one section for everything except tcmalloc_or_debug // due to its special linkage mode, which prevents merging of the sections. } -- cgit 1.4.1