Commit 905c559e authored by Kees Cook's avatar Kees Cook
Browse files

gcc-plugins: Always define CONST_CAST_GIMPLE and CONST_CAST_TREE 



For gcc-16, the CONST_CAST macro family was removed. Add back what
we were using in gcc-common.h, as they are simple wrappers.

See GCC commits:
  c3d96ff9e916c02584aa081f03ab999292efbb50
  458c7926d48959abcb2c1adaa22458e27459a551

Suggested-by: default avatarIngo Saitz <ingo@hannover.ccc.de>
Link: https://lore.kernel.org/lkml/ab6OKoay0OWkywjK@spatz.zoo


Fixes: 6b90bd4b ("GCC plugin infrastructure")
Tested-by: default avatarIvan Bulatovic <combuster@archlinux.us>
Tested-by: default avatarChristopher Cradock <christopher@cradock.myzen.co.uk>
Signed-off-by: default avatarKees Cook <kees@kernel.org>
parent 7fd2df20

scripts/gcc-plugins/gcc-common.h

+3 −1
Original line number Diff line number Diff line
@@ -309,7 +309,9 @@ typedef const gimple *const_gimple_ptr; 
#define gimple gimple_ptr

#define const_gimple const_gimple_ptr

#undef CONST_CAST_GIMPLE

#define CONST_CAST_GIMPLE(X) CONST_CAST(gimple, (X))

#define CONST_CAST_GIMPLE(X) const_cast<gimple>((X))

#undef CONST_CAST_TREE

#define CONST_CAST_TREE(X) const_cast<tree>((X))



/* gimple related */

static inline gimple gimple_build_assign_with_ops(enum tree_code subcode, tree lhs, tree op1, tree op2 MEM_STAT_DECL)