[runtime] Fix -Wcast-function-type-mismatch warnings; NFC (2/4)

Wrapper functions exists for the gather/scatter runtime functions which have
an additional argument, but the wrappers are used interchangeably with the
actual gather/scatter runtime functions. This patch fixes the runtime function
types to declare the optional argument, so that the runtime functions and their
helpers have the same types.

Author: bryanpkc

runtime/flang/gather.c

@@ -191,5 +191,5 @@ static gatherfn_t __fort_local_gather[__NTYPES] = {
 void
 local_gather_WRAPPER(int n, void *dst, void *src, int *gv, __INT_T kind)
 {
-  __fort_local_gather[kind](n, dst, src, gv);
+  __fort_local_gather[kind](n, dst, src, gv, /* optional */ 0);
 }

runtime/flang/gathscat.c

@@ -191,7 +191,7 @@ static scatterfn_t __fort_local_scatter[__NTYPES] = {
 void
 local_scatter_WRAPPER(int n, void *dst, int *sv, void *src, __INT_T kind)
 {
-  __fort_local_scatter[kind](n, dst, sv, src);
+  __fort_local_scatter[kind](n, dst, sv, src, /* optional */ 0);
 }
 
 /* local gather-scatter functions */
@@ -377,5 +377,5 @@ void
 local_gathscat_WRAPPER(int n, void *dst, int *sv, void *src, int *gv,
                        __INT_T kind)
 {
-  __fort_local_gathscat[kind](n, dst, sv, src, gv);
+  __fort_local_gathscat[kind](n, dst, sv, src, gv, /* optional */ 0);
 }

runtime/flang/scatter.c

@@ -99,21 +99,11 @@ static void I8(gathscat_start)(void *skp, char *rb, char *sb, F90_Desc *rd,
 
   j = k = sk->lclcnt;
   if (k > 0) {
-
     /* 
      * make sure base type of object hasn't changed for local gather...
      * This can occur when we share schedules across objects ...
      */
-    /* Couldn't find where gathscatfn is set to local_gathscat_WRAPPER.
-       Possible dead code? Work around the compiler warning with an
-       explicit cast for now. */
-    if (sk->gathscatfn == (gathscatfn_t)local_gathscat_WRAPPER) {
-
-      local_gathscat_WRAPPER(k, rp, sk->soff, sp, sk->goff, F90_KIND_G(rd));
-
-    } else {
-      sk->gathscatfn(k, rp, sk->soff, sp, sk->goff);
-    }
+    sk->gathscatfn(k, rp, sk->soff, sp, sk->goff, F90_KIND_G(rd));
   }
   /* now non-local elements */
 
@@ -160,20 +150,12 @@ static void I8(gathscat_start)(void *skp, char *rb, char *sb, F90_Desc *rd,
       }
 
       if (nr > 0) {
-
         /* 
          * Added call to wrapper routine for local scatter
          * in order to handle cases where the schedule is
          * shared between objects of different types...
          */
-        /* Couldn't find where gathscatfn is set to local_gathscat_WRAPPER.
-           Possible dead code? Work around the compiler warning with an
-           explicit cast for now. */
-        if (sk->scatterfn == (scatterfn_t)local_scatter_WRAPPER) {
-          local_scatter_WRAPPER(nr, rp, sk->soff + k, bufr, F90_KIND_G(rd));
-        } else {
-          sk->scatterfn(nr, rp, sk->soff + k, bufr);
-        }
+        sk->scatterfn(nr, rp, sk->soff + k, bufr, F90_KIND_G(rd));
       }
 
       j += ns;

runtime/flang/scatter.h

@@ -42,9 +42,12 @@ struct gathscat_dim {
   __INT_T *xmap;     /* map index axis -> unvectored axis */
 };
 
-typedef void (*gatherfn_t)(int, void *, void *, int *);
-typedef void (*gathscatfn_t)(int, void *, int *, void *, int *);
-typedef void (*scatterfn_t)(int, void *, int *, void *);
+typedef void (*gatherfn_t)(int n, void *dst, void *src, int *gv,
+                           __INT_T optional_kind);
+typedef void (*gathscatfn_t)(int n, void *dst, int *sv, void *src, int *gv,
+                             __INT_T optional_kind);
+typedef void (*scatterfn_t)(int n, void *dst, int *sv, void *src,
+                            __INT_T optional_kind);
 
 struct gathscat_parm {
   const char *what;           /* "GATHER"/"XXX_SCATTER" */