GCC 6: "gimple" changed from a ptr to the base class

Author: davidmalcolm

gcc-c-api/gcc-cfg.c

@@ -202,7 +202,7 @@ gcc_cfg_block_for_each_gimple_phi (gcc_cfg_block block,
        !gsi_end_p (gsi); gsi_next (&gsi))
     {
 
-      gimple stmt = gsi_stmt (gsi);
+      gimple_stmt_ptr stmt = gsi_stmt (gsi);
       if (cb (gcc_private_make_gimple_phi (stmt), user_data))
 	{
 	  return true;
@@ -231,7 +231,7 @@ gcc_cfg_block_for_each_gimple (gcc_cfg_block block,
        !gsi_end_p (gsi); gsi_next (&gsi))
     {
 
-      gimple stmt = gsi_stmt (gsi);
+      gimple_stmt_ptr stmt = gsi_stmt (gsi);
       if (cb (gcc_private_make_gimple (stmt), user_data))
 	{
 	  return true;

gcc-c-api/gcc-common.h

@@ -27,6 +27,12 @@
 #define GCC_PUBLIC_API(RETURN_TYPE) extern RETURN_TYPE
 #define GCC_PRIVATE_API(RETURN_TYPE) extern RETURN_TYPE
 
+#if (GCC_VERSION >= 6000)
+typedef gimple *gimple_stmt_ptr;
+#else
+typedef gimple gimple_stmt_ptr;
+#endif
+
 #include "gcc-public-types.h"
 
 /* For internal use: */

gcc-c-api/gcc-gimple.c

@@ -53,14 +53,21 @@ GCC_IMPLEMENT_PUBLIC_API (void) gcc_gimple_mark_in_use (gcc_gimple stmt)
 
   /* GCC 4.9 converted gimple to a class hierarchy */
 #if (GCC_VERSION >= 4009)
+
+  /* GCC 6 converted the base class from "gimple_statement_base" to
+     "gimple".  */
+# if (GCC_VERSION >= 6000)
+  gt_ggc_mx_gimple (stmt.inner);
+# else
   gt_ggc_mx_gimple_statement_base (stmt.inner);
-#else
+# endif
+#else /* #if (GCC_VERSION >= 4009) */
   gt_ggc_mx_gimple_statement_d (stmt.inner);
-#endif
+#endif  /* #if (GCC_VERSION >= 4009) */
 }
 
 GCC_IMPLEMENT_PRIVATE_API (struct gcc_gimple_phi)
-gcc_private_make_gimple_phi (gimple inner)
+gcc_private_make_gimple_phi (gimple_stmt_ptr inner)
 {
   struct gcc_gimple_phi result;
   GIMPLE_CHECK (inner, GIMPLE_PHI);
@@ -69,7 +76,7 @@ gcc_private_make_gimple_phi (gimple inner)
 }
 
 GCC_IMPLEMENT_PRIVATE_API (struct gcc_gimple_call)
-gcc_private_make_gimple_call (gimple inner)
+gcc_private_make_gimple_call (gimple_stmt_ptr inner)
 {
   struct gcc_gimple_call result;
   GIMPLE_CHECK (inner, GIMPLE_CALL);
@@ -78,7 +85,7 @@ gcc_private_make_gimple_call (gimple inner)
 }
 
 GCC_IMPLEMENT_PRIVATE_API (struct gcc_gimple)
-gcc_private_make_gimple (gimple inner)
+gcc_private_make_gimple (gimple_stmt_ptr inner)
 {
   struct gcc_gimple result;
   result.inner = inner;

gcc-c-api/gimple.xml

@@ -21,7 +21,7 @@
 
   <doc>GIMPLE statements</doc>
 
-  <type name="gimple" varname="stmt" inner="gimple">
+  <type name="gimple" varname="stmt" inner="gimple_stmt_ptr">
     <attribute name="location" kind="location">
       <doc>Source code location of this statement</doc>
     </attribute>