Skip to contentSkip to conversation

gcc-plugins: Reorganize gimple includes for GCC 13

PATCH In review Kees Cook 2 participants 2 messages Jan 18, 2023 Gcc plugins

lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 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]/ open here
Cc [email protected]
Signed-off-by Kees Cook <[email protected]>
---
 scripts/gcc-plugins/gcc-common.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
scripts/gcc-plugins/gcc-common.h +2 -2
index 9a1895747b15..84c730da36dd 100644
@@ -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"
Signature · 1 line
2.34.1
Acked-by Reviewed-by on v1 1/1
#1 lore raw
Quoted 27 lines · 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]/ open here
Cc [email protected]
Signed-off-by Kees Cook <[email protected]>
---
 scripts/gcc-plugins/gcc-common.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
scripts/gcc-plugins/gcc-common.h +2 -0
index 9a1895747b15..84c730da36dd 100644
@@ -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"

scripts/gcc-plugins/gcc-common.h line 93

Quoted 9 lines
scripts/gcc-plugins/gcc-common.h +0 -2
@@ -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]>