From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 09BD53852C42; Wed, 23 Nov 2022 14:39:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 09BD53852C42 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1669214361; bh=Z0ZpeKRCKDOTs4aFJTZDciGpuI0zSRkfFbwFScCChBQ=; h=From:To:Subject:Date:From; b=JCZ96naIVFazOnEspdG2cXA3Ky7PLCS8dfAqqWS6c0BmG5IzM7hF+cpa5srz4VO3c RLYg8l8mQZ93oc+rMThlpjrEyTDImohUvFjMT3WTmCDeS1OVuX6vnYZ0jh2w7aRU5u SYroltt2P8OPNYFXcJ2kd/aarCY6fNrb247YwmDE= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Szabolcs Nagy To: glibc-cvs@sourceware.org Subject: [glibc/arm/morello/main] malloc: Fix alignment logic in obstack X-Act-Checkin: glibc X-Git-Author: Szabolcs Nagy X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: 5ba5d609c15317cfe93f22201cd008200cab9c24 X-Git-Newrev: 8491c1adc9686641653cb9fb29a8d51ef349933c Message-Id: <20221123143921.09BD53852C42@sourceware.org> Date: Wed, 23 Nov 2022 14:39:21 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=8491c1adc9686641653cb9fb29a8d51ef349933c commit 8491c1adc9686641653cb9fb29a8d51ef349933c Author: Szabolcs Nagy Date: Wed Mar 16 14:07:04 2022 +0000 malloc: Fix alignment logic in obstack If sizeof(ptrdiff_t) < sizeof(void*) the alignment logic was wrong: incorrectly assumed that base was already sufficiently aligned. Use more robust alignment logic: this one should work on any target. Note: this is an installed header so it must be namespace clean and portable hence it uses unsigned long for the alignment offset. Diff: --- malloc/obstack.h | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/malloc/obstack.h b/malloc/obstack.h index 4b01cdfe4d..1cf18e5464 100644 --- a/malloc/obstack.h +++ b/malloc/obstack.h @@ -116,22 +116,9 @@ # define PTR_INT_TYPE ptrdiff_t #endif -/* If B is the base of an object addressed by P, return the result of - aligning P to the next multiple of A + 1. B and P must be of type - char *. A + 1 must be a power of 2. */ - -#define __BPTR_ALIGN(B, P, A) ((B) + (((P) - (B) + (A)) & ~(A))) - -/* Similar to _BPTR_ALIGN (B, P, A), except optimize the common case - where pointers can be converted to integers, aligned as integers, - and converted back again. If PTR_INT_TYPE is narrower than a - pointer (e.g., the AS/400), play it safe and compute the alignment - relative to B. Otherwise, use the faster strategy of computing the - alignment relative to 0. */ - -#define __PTR_ALIGN(B, P, A) \ - __BPTR_ALIGN (sizeof (PTR_INT_TYPE) < sizeof (void *) ? (B) : (char *) 0, \ - P, A) +/* Align P to the next multiple of A + 1, where A + 1 is a power of 2, + A fits into unsigned long and P has type char *. */ +#define __PTR_ALIGN(B, P, A) ((P) + (-(unsigned long)(P) & (A))) #include