Skip to content

Commit

Permalink
alloc-util: Disallow inlining of expand_to_usable
Browse files Browse the repository at this point in the history
Explicitly set __attribute__ ((noinline)) so that the compiler does not
attempt to inline expand_to_usable, even with LTO.
  • Loading branch information
siddhesh authored and DaanDeMeyer committed Jan 8, 2023
1 parent 9907a7e commit 4f79f54
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
7 changes: 4 additions & 3 deletions src/basic/alloc-util.h
Original file line number Diff line number Diff line change
Expand Up @@ -186,10 +186,11 @@ void* greedy_realloc0(void **p, size_t need, size_t size);
#endif

/* Dummy allocator to tell the compiler that the new size of p is newsize. The implementation returns the
* pointer as is; the only reason for its existence is as a conduit for the _alloc_ attribute. This cannot be
* a static inline because gcc then loses the attributes on the function.
* pointer as is; the only reason for its existence is as a conduit for the _alloc_ attribute. This must not
* be inlined (hence a non-static function with _noinline_ because LTO otherwise tries to inline it) because
* gcc then loses the attributes on the function.
* See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96503 */
void *expand_to_usable(void *p, size_t newsize) _alloc_(2) _returns_nonnull_;
void *expand_to_usable(void *p, size_t newsize) _alloc_(2) _returns_nonnull_ _noinline_;

static inline size_t malloc_sizeof_safe(void **xp) {
if (_unlikely_(!xp || !*xp))
Expand Down
1 change: 1 addition & 0 deletions src/fundamental/macro-fundamental.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#define _hidden_ __attribute__((__visibility__("hidden")))
#define _likely_(x) (__builtin_expect(!!(x), 1))
#define _malloc_ __attribute__((__malloc__))
#define _noinline_ __attribute__((noinline))
#define _noreturn_ _Noreturn
#define _packed_ __attribute__((__packed__))
#define _printf_(a, b) __attribute__((__format__(printf, a, b)))
Expand Down

0 comments on commit 4f79f54

Please sign in to comment.