Build fixes for OG12 on more recent GCC versions

This fixes a number of minor issues that can cause the build to fail on
recent versions of GCC.

2022-06-30  Kwok Cheung Yeung  <kcy@codesourcery.com>

	gcc/fortran/
	* openmp.cc (gfc_resolve_omp_allocate): Initialize tail to NULL.

(This should be a fixup to 491478d12b83e102f72858e8a871a25c951df293: 'Add
parsing support for allocate directive (OpenMP 5.0)')

2022-06-30  Kwok Cheung Yeung  <kcy@codesourcery.com>

	gcc/
	* omp-offload.cc (oacc_loop_get_cfg_loop): Cast tail_mark to
	gimple* for dump_printf.
	* tree-scalar-evolution.cc (oacc_ifn_call_extract): Remove
	unused variable 'call'.

(This should be a fixup to 491478d12b83e102f72858e8a871a25c951df293: 'Build
fix for 'openacc: Use Graphite for dependence analysis in "kernels" region')

2022-06-30  Kwok Cheung Yeung  <kcy@codesourcery.com>

	gcc/
	* omp-low.cc (usm_transform): Remove unused function argument.

(This should be a fixup to 54c2d861ac62e30ebf34a4e62ee0d55478a742b9: 'Build
fix for 'openmp: Use libgomp memory allocation functions with unified shared
memory')

2022-06-30  Kwok Cheung Yeung  <kcy@codesourcery.com>

	gcc/
	* omp-offload.cc (oacc_loop_warn_if_false_independent): Remove extra
	'.' at end of message.

(This should be a fixup to 01e6774b725ffa667efd818a46795189a281addf: 'Build
fix for 'openacc: Warn about "independent" "kernels" loops with
data-dependences')

2022-06-30  Tobias Burnus  <tobias@codesourcery.com>

	gcc/
	* graphite-isl-ast-to-gimple.cc (graphite_oacc_analyze_scop): Update
	arguments of dump_printf.

(This should be a fixup to a7e863fc4d54fb645fef05f01a024250184964bb:
'openacc: Add runtime alias checking for OpenACC kernels')

diff --git a/gcc/ChangeLog.omp b/gcc/ChangeLog.omp
index 1455a9605c25c59a03290ba8eb45bee81c7e2e51..af922a6cb1e724c9ce406b38cbf10572408cbfbc 100644 (file)
--- a/gcc/ChangeLog.omp
+++ b/gcc/ChangeLog.omp
@@ -1,3 +1,24 @@
+2022-06-30  Tobias Burnus  <tobias@codesourcery.com>
+
+       * graphite-isl-ast-to-gimple.cc (graphite_oacc_analyze_scop): Update
+       arguments of dump_printf.
+
+2022-06-30  Kwok Cheung Yeung  <kcy@codesourcery.com>
+
+       * omp-offload.cc (oacc_loop_warn_if_false_independent): Remove extra
+       '.' at end of message.
+
+2022-06-30  Kwok Cheung Yeung  <kcy@codesourcery.com>
+
+       * omp-low.cc (usm_transform): Remove unused function argument.
+
+2022-06-30  Kwok Cheung Yeung  <kcy@codesourcery.com>
+
+       * omp-offload.cc (oacc_loop_get_cfg_loop): Cast tail_mark to
+       gimple* for dump_printf.
+       * tree-scalar-evolution.cc (oacc_ifn_call_extract): Remove
+       unused variable 'call'.
+
 2022-06-30  Kwok Cheung Yeung  <kcy@codesourcery.com>
 
        * gimplify.cc (gimplify_scan_omp_clauses): Remove extra

diff --git a/gcc/fortran/ChangeLog.omp b/gcc/fortran/ChangeLog.omp
index 59f47d73b735f127c151eb603eba5db2e561ce63..63eba462c436790e43b44c80b06a2e86c21b5499 100644 (file)
--- a/gcc/fortran/ChangeLog.omp
+++ b/gcc/fortran/ChangeLog.omp
@@ -1,3 +1,7 @@
+2022-06-30  Kwok Cheung Yeung  <kcy@codesourcery.com>
+
+       * openmp.cc (gfc_resolve_omp_allocate): Initialize tail to NULL.
+
 2022-05-22  Kwok Cheung Yeung  <kcy@codesourcery.com>
 
        * trans-array.cc (gfc_conv_array_ref): Update arguments to

diff --git a/gcc/fortran/openmp.cc b/gcc/fortran/openmp.cc
index b6f070bc876750ca11664e9757b2727e4f2ba8ed..2ff923af9b5c0b7bbe95a5def66174ea6c135c21 100644 (file)
--- a/gcc/fortran/openmp.cc
+++ b/gcc/fortran/openmp.cc
@@ -10128,7 +10128,7 @@ gfc_resolve_omp_allocate (gfc_code *code, gfc_namespace *ns)
   gfc_alloc *al;
   gfc_omp_namelist *n = NULL;
   gfc_omp_namelist *cn = NULL;
-  gfc_omp_namelist *p, *tail;
+  gfc_omp_namelist *p, *tail = NULL;
   gfc_code *cur;
   hash_set<gfc_symbol*> vars;
 

diff --git a/gcc/graphite-isl-ast-to-gimple.cc b/gcc/graphite-isl-ast-to-gimple.cc
index 49cbb9d5cfe404d82f14430f01c88c1dcebb9fba..2b825bac3d51736920f1af06f21373ebf013b1ce 100644 (file)
--- a/gcc/graphite-isl-ast-to-gimple.cc
+++ b/gcc/graphite-isl-ast-to-gimple.cc
@@ -1781,7 +1781,7 @@ graphite_oacc_analyze_scop (scop_p scop)
                  if (dump_enabled_p () && dump_flags & TDF_DETAILS)
                    dump_printf (MSG_NOTE,
                                 "Runtime alias condition applied to: %G",
-                                goacc_call);
+                                stmt);
                }
            }
        }
@@ -1793,7 +1793,8 @@ graphite_oacc_analyze_scop (scop_p scop)
             nothing much to do here.  */
          if (dump_enabled_p ())
            dump_printf (MSG_NOTE, "Runtime alias check *not* inserted for"
-                        " bb %d (GOACC_LOOP not found)");
+                        " bb %d (GOACC_LOOP not found)",
+                        goacc_loop_block->index);
 
          /* Unset can_be_parallel, in case something else might use it.  */
          for (unsigned int i = 0; i < region->bbs.length (); i++)

diff --git a/gcc/omp-low.cc b/gcc/omp-low.cc
index bd7515d6b78ad3679f33d45c5f20837859f6752d..dc53373cac7ae2ccc8dbd4a4234967b0d549bb28 100644 (file)
--- a/gcc/omp-low.cc
+++ b/gcc/omp-low.cc
@@ -16232,7 +16232,7 @@ make_pass_diagnose_omp_blocks (gcc::context *ctxt)
 
 static tree
 usm_transform (gimple_stmt_iterator *gsi_p, bool *,
-              struct walk_stmt_info *wi)
+              struct walk_stmt_info *)
 {
   gimple *stmt = gsi_stmt (*gsi_p);
   /* ompx_unified_shared_mem_alloc is 10.  */

diff --git a/gcc/omp-offload.cc b/gcc/omp-offload.cc
index b3f534c579d9853705f5e18a13d5d75859b1c6e0..6656bc48e95aaef83ddcf1e7f3a99361c332498a 100644 (file)
--- a/gcc/omp-offload.cc
+++ b/gcc/omp-offload.cc
@@ -1867,7 +1867,7 @@ oacc_loop_get_cfg_loop (oacc_loop *loop)
 
       if (dump_file && (dump_flags & TDF_DETAILS))
        dump_printf (MSG_OPTIMIZED_LOCATIONS | MSG_PRIORITY_INTERNALS, "%G",
-                    tail_mark);
+                    (gimple *) tail_mark);
 
       loop_p mark_cfg_loop = tail_mark->bb->loop_father;
       loop_p current_cfg_loop = mark_cfg_loop;
@@ -2096,7 +2096,7 @@ oacc_loop_warn_if_false_independent (oacc_loop *loop)
   if (!can_be_parallel)
     warning_at (loop->loc, 0,
                 "loop has \"independent\" clause but data dependences were "
-                "found.");
+               "found");
 }
 
 /* Walk the OpenACC loop hierarchy checking and assigning the

diff --git a/gcc/tree-scalar-evolution.cc b/gcc/tree-scalar-evolution.cc
index 3c01bd608f0e2e7b97adc49024ee7806e3098936..8f4099046deb34fad8824d0ea354fe2398e9e705 100644 (file)
--- a/gcc/tree-scalar-evolution.cc
+++ b/gcc/tree-scalar-evolution.cc
@@ -614,8 +614,6 @@ oacc_call_analyzable_p (tree t)
 tree
 oacc_ifn_call_extract (gimple *stmt)
 {
-  gcall *call = as_a<gcall *> (stmt);
-
   if (oacc_call_analyzable_p (stmt))
     {
       gcc_assert (gimple_call_internal_p (stmt, IFN_GOACC_LOOP));