Re: [PATCH] jit: avoid calloc() poisoning on musl [PR106102]

[Richard Biener <rguenther@suse.de>]

On Mon, 27 Jun 2022, Sergei Trofimovich wrote:

> From: Sergei Trofimovich <siarheit@google.com>
> 
> On musl <pthread.h> uses calloc() (via <sched.h>). jit/ includes
> it directly and exposes use of poisoned calloc():
> 
>     /build/build/./prev-gcc/xg++ ... ../../gcc-13-20220626/gcc/jit/jit-playback.cc
>     make[3]: *** [Makefile:1143: jit/libgccjit.o] Error 1
>     make[3]: *** Waiting for unfinished jobs....
>     In file included from /<<NIX>>/musl-1.2.3-dev/include/pthread.h:30,
>                      from ../../gcc-13-20220626/gcc/jit/jit-playback.cc:44:
>     /<<NIX>>/musl-1.2.3-dev/include/sched.h:84:7: error: attempt to use poisoned "calloc"
>        84 | void *calloc(size_t, size_t);
>           |       ^
>     /<<NIX>>/musl-1.2.3-dev/include/sched.h:124:36: error: attempt to use poisoned "calloc"
>       124 | #define CPU_ALLOC(n) ((cpu_set_t *)calloc(1,CPU_ALLOC_SIZE(n)))
>           |                                    ^
> 
> The change moves sys-specific header before "system.h" inclusion
> to evade poisoning.
> 
> gcc/jit/
> 
> 	PR c++/106102
> 	* jit-playback.cc: Include <pthread.h> before "system.h" to avoid calloc()
> 	poisoning.
> 	* jit-recording.cc: Ditto.
> 	* libgccjit.cc: Ditto.
> ---
>  gcc/jit/jit-playback.cc  | 5 +++--
>  gcc/jit/jit-recording.cc | 4 +++-
>  gcc/jit/libgccjit.cc     | 4 +++-
>  3 files changed, 9 insertions(+), 4 deletions(-)
> 
> diff --git a/gcc/jit/jit-playback.cc b/gcc/jit/jit-playback.cc
> index 6be6bdf8dea..4ab7b59cab9 100644
> --- a/gcc/jit/jit-playback.cc
> +++ b/gcc/jit/jit-playback.cc
> @@ -19,6 +19,9 @@ along with GCC; see the file COPYING3.  If not see
>  <http://www.gnu.org/licenses/>.  */
>  
>  #include "config.h"
> +/* <pthread.h> has to go before "system.h" as it pull in to-be-poisoned
> +   symbols on musl like calloc().  */
> +#include <pthread.h>

there are probably targets where there need to be some #includes before
including pthread.h which means it would be best to include pthread.h
from within system.h (conditional, of course, just add a
INCLUDE_PTHREAD_H preprocessor guard).

Richard.

>  #include "system.h"
>  #include "coretypes.h"
>  #include "target.h"
> @@ -41,8 +44,6 @@ along with GCC; see the file COPYING3.  If not see
>  #include "diagnostic.h"
>  #include "stmt.h"
>  
> -#include <pthread.h>
> -
>  #include "jit-playback.h"
>  #include "jit-result.h"
>  #include "jit-builtins.h"
> diff --git a/gcc/jit/jit-recording.cc b/gcc/jit/jit-recording.cc
> index 697dee66e73..9505ed3b279 100644
> --- a/gcc/jit/jit-recording.cc
> +++ b/gcc/jit/jit-recording.cc
> @@ -19,13 +19,15 @@ along with GCC; see the file COPYING3.  If not see
>  <http://www.gnu.org/licenses/>.  */
>  
>  #include "config.h"
> +/* <pthread.h> has to go before "system.h" as it pull in to-be-poisoned
> +   symbols on musl like calloc().  */
> +#include <pthread.h>
>  #include "system.h"
>  #include "coretypes.h"
>  #include "tm.h"
>  #include "pretty-print.h"
>  #include "toplev.h"
>  
> -#include <pthread.h>
>  
>  #include "jit-builtins.h"
>  #include "jit-recording.h"
> diff --git a/gcc/jit/libgccjit.cc b/gcc/jit/libgccjit.cc
> index 0e76097b4ba..6a0ac8aaba2 100644
> --- a/gcc/jit/libgccjit.cc
> +++ b/gcc/jit/libgccjit.cc
> @@ -19,12 +19,14 @@ along with GCC; see the file COPYING3.  If not see
>  <http://www.gnu.org/licenses/>.  */
>  
>  #include "config.h"
> +/* <pthread.h> has to go before "system.h" as it pull in to-be-poisoned
> +   symbols on musl like calloc().  */
> +#include <pthread.h>
>  #include "system.h"
>  #include "coretypes.h"
>  #include "timevar.h"
>  #include "typed-splay-tree.h"
>  #include "cppbuiltin.h"
> -#include <pthread.h>
>  
>  #include "libgccjit.h"
>  #include "jit-recording.h"
> 

-- 
Richard Biener <rguenther@suse.de>
SUSE Software Solutions Germany GmbH, Frankenstra