2023-01-18 20:39:19

by Kees Cook

Subject: [PATCH] gcc-plugins: Reorganize gimple includes for GCC 13

The gimple-iterator.h header must be included before gimple-fold.h
starting with GCC 13. Reorganize gimple headers to work for all GCC
versions.

Reported-by: Palmer Dabbelt <[email protected]>
Link: https://lore.kernel.org/all/[email protected]/
Cc: [email protected]
Signed-off-by: Kees Cook <[email protected]>
---
scripts/gcc-plugins/gcc-common.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/gcc-plugins/gcc-common.h b/scripts/gcc-plugins/gcc-common.h
index 9a1895747b15..84c730da36dd 100644
--- a/scripts/gcc-plugins/gcc-common.h
+++ b/scripts/gcc-plugins/gcc-common.h
@@ -71,7 +71,9 @@
#include "varasm.h"
#include "stor-layout.h"
#include "internal-fn.h"
+#include "gimple.h"
#include "gimple-expr.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "context.h"
#include "tree-ssa-alias.h"
@@ -85,10 +87,8 @@
#include "tree-eh.h"
#include "stmt.h"
#include "gimplify.h"
-#include "gimple.h"
#include "tree-phinodes.h"
#include "tree-cfg.h"
-#include "gimple-iterator.h"
#include "gimple-ssa.h"
#include "ssa-iterators.h"

--
2.34.1

2023-01-18 21:36:52

by Palmer Dabbelt

Subject: Re: [PATCH] gcc-plugins: Reorganize gimple includes for GCC 13

On Wed, 18 Jan 2023 12:24:02 PST (-0800), [email protected] wrote:
> The gimple-iterator.h header must be included before gimple-fold.h
> starting with GCC 13. Reorganize gimple headers to work for all GCC
> versions.
>
> Reported-by: Palmer Dabbelt <[email protected]>
> Link: https://lore.kernel.org/all/[email protected]/
> Cc: [email protected]
> Signed-off-by: Kees Cook <[email protected]>
> ---
> scripts/gcc-plugins/gcc-common.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/scripts/gcc-plugins/gcc-common.h b/scripts/gcc-plugins/gcc-common.h
> index 9a1895747b15..84c730da36dd 100644
> --- a/scripts/gcc-plugins/gcc-common.h
> +++ b/scripts/gcc-plugins/gcc-common.h
> @@ -71,7 +71,9 @@
> #include "varasm.h"
> #include "stor-layout.h"
> #include "internal-fn.h"
> +#include "gimple.h"
> #include "gimple-expr.h"
> +#include "gimple-iterator.h"
> #include "gimple-fold.h"
> #include "context.h"
> #include "tree-ssa-alias.h"
> @@ -85,10 +87,8 @@
> #include "tree-eh.h"
> #include "stmt.h"
> #include "gimplify.h"
> -#include "gimple.h"
> #include "tree-phinodes.h"
> #include "tree-cfg.h"
> -#include "gimple-iterator.h"
> #include "gimple-ssa.h"
> #include "ssa-iterators.h"

Thanks, not sure how I missed it the first round. My testing box is
tied up, but I'v egot the same diff lying around somewhere so

Acked-by: Palmer Dabbelt <[email protected]>
Reviewed-by: Palmer Dabbelt <[email protected]>