[PATCH v2 3/3] malloc: Remove currently broken memory tagging

[Adhemerval Zanella Netto]

On 20/05/26 15:19, DJ Delorie wrote:
> Yury Khrustalev <yury.khrustalev@arm.com> writes:
>> DJ, could you clarify what is the problem here?
> 
> The patch didn't apply for me either.
> 
> Your patch has this:
> 
> -static __always_inline void *
> -tag_at (void *ptr)
> -{
> -  return ptr;
> -}
> -
>  
>  /*
>    MORECORE-related declarations. By default, rely on sbrk
> 
> but the git source had this:
> 
> static __always_inline void *
> tag_at (void *ptr)
> {
>   if (__glibc_unlikely (mtag_enabled))
>     return __libc_mtag_address_get_tag (ptr);
>   return ptr;
> }
> 
> #include <string.h>
> 
> /*
>   MORECORE-related declarations. By default, rely on sbrk
> 
> Note the extra #include, which you just removed.  After I updated my
> sources just now the patch applied.
> 
> Note that the trybot uses "git am" to apply patches.  I had varying lock
> with "git apply" and "patch", even after updating my source tree.
> 

The git-pw does work though:

$ git-pw patch apply 135346
Applying: configure: remove --enable-memory-tagging option
Applying: malloc: Remove code conditional on USE_MTAG
Applying: malloc: Remove currently broken memory tagging

I am not sure why the CI bots is failing in this case.