diff options
| author | Siddhesh Poyarekar <siddhesh@redhat.com> | 2015-02-18 11:06:05 +0530 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2017-01-27 13:15:58 -0200 |
| commit | 7f2efd6c269a2ab2eee80bffa5bcb2538aa89641 (patch) | |
| tree | 2b8318af2c4813ac17b2269543fb78ff8a51f12e | |
| parent | a68cafa11c500d8a49a3014c43c5152859d037ae (diff) | |
| download | glibc-7f2efd6c269a2ab2eee80bffa5bcb2538aa89641.tar.gz glibc-7f2efd6c269a2ab2eee80bffa5bcb2538aa89641.tar.xz glibc-7f2efd6c269a2ab2eee80bffa5bcb2538aa89641.zip | |
Consolidate arena_lookup and arena_lock into a single arena_get
This seems to have been left behind as an artifact of some old changes and can now be merged. Verified that the only generated code change on x86_64 is that of line numbers in asserts, like so: @@ -27253,7 +27253,7 @@ Disassembly of section .text: 416f09: 48 89 42 20 mov %rax,0x20(%rdx) 416f0d: e9 7e f6 ff ff jmpq 416590 <_int_free+0x230> 416f12: b9 3f 9f 4a 00 mov $0x4a9f3f,%ecx - 416f17: ba d5 0f 00 00 mov $0xfd5,%edx + 416f17: ba d6 0f 00 00 mov $0xfd6,%edx 416f1c: be a8 9b 4a 00 mov $0x4a9ba8,%esi 416f21: bf 6a 9c 4a 00 mov $0x4a9c6a,%edi 416f26: e8 45 e8 ff ff callq 415770 <__malloc_assert>
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | malloc/malloc.c | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 4f035c460d..12f2687d91 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-02-18 Siddhesh Poyarekar <siddhesh@redhat.com> + + * malloc/malloc.c (__libc_malloc): Consolidate arena_lookup and + arena_lock into a single arena_get. + 2015-05-22 Roland McGrath <roland@hack.frob.com> * nptl/nptl-init.c (__pthread_initialize_minimal_internal): diff --git a/malloc/malloc.c b/malloc/malloc.c index aa7edbfd45..d2d80388ca 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -2883,9 +2883,8 @@ __libc_malloc (size_t bytes) if (__builtin_expect (hook != NULL, 0)) return (*hook)(bytes, RETURN_ADDRESS (0)); - arena_lookup (ar_ptr); + arena_get (ar_ptr, bytes); - arena_lock (ar_ptr, bytes); if (!ar_ptr) return 0; |