Merge pull request #555 from neok-m4700/icar

FIX issue 552

Author: zbeekman

CMakeLists.txt

@@ -786,6 +786,7 @@ if(opencoarrays_aware_compiler)
   add_caf_test(issue-488-multi-dim-cobounds-false 8 issue-488-multi-dim-cobounds false)
   add_caf_test(issue-503-multidim-array-broadcast 2 issue-503-multidim-array-broadcast)
   add_caf_test(issue-503-non-contig-red-ndarray   2 issue-503-non-contig-red-ndarray)
+  add_caf_test(issue-552-send_by_ref-singleton    2 issue-552-send_by_ref-singleton)
   if((gfortran_compiler AND (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7.0.0)) OR (CAF_RUN_DEVELOPER_TESTS OR $ENV{OPENCOARRAYS_DEVELOPER}))
     add_caf_test(issue-515-mimic-mpi-gatherv 2 issue-515-mimic-mpi-gatherv)
   endif()

src/libcaf.h

@@ -28,10 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  */
 #ifndef LIBCAF_H
 #define LIBCAF_H
 
-#include <stddef.h>	/* For size_t.  */
+#include <stddef.h>     /* For size_t.  */
 #include <stdbool.h>
 
-#include  "libcaf-version-def.h"
+#include "libcaf-version-def.h"
 #include "libcaf-gfortran-descriptor.h"
 
 #include <mpi.h>
@@ -56,11 +56,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  */
 
 /* Definitions of the Fortran 2008 standard; need to kept in sync with
    ISO_FORTRAN_ENV, cf. libgfortran.h.  */
-#define STAT_UNLOCKED		0
-#define STAT_LOCKED		1
-#define STAT_LOCKED_OTHER_IMAGE	2
+#define STAT_UNLOCKED           0
+#define STAT_LOCKED             1
+#define STAT_LOCKED_OTHER_IMAGE 2
 #define STAT_DUP_SYNC_IMAGES    3
-#define STAT_STOPPED_IMAGE 	6000
+#define STAT_STOPPED_IMAGE      6000
 #define STAT_FAILED_IMAGE       6001
 
 /* Describes what type of array we are registerring. Keep in sync with
@@ -95,14 +95,12 @@ typedef struct caf_teams_list {
   caf_team_t team;
   int team_id;
   struct caf_teams_list *prev;
-}
-caf_teams_list;
+} caf_teams_list;
 
 typedef struct caf_used_teams_list {
   struct caf_teams_list *team_list_elem;
   struct caf_used_teams_list *prev;
-}
-caf_used_teams_list;
+} caf_used_teams_list;
 
 
 /* When there is a vector subscript in this dimension, nvec == 0, otherwise,
@@ -119,8 +117,7 @@ typedef struct caf_vector_t {
       ptrdiff_t lower_bound, upper_bound, stride;
     } triplet;
   } u;
-}
-caf_vector_t;
+} caf_vector_t;
 
 
 #ifdef GCC_GE_7
@@ -174,30 +171,30 @@ typedef struct caf_reference_t {
       /* The offset (in bytes) of the component in the derived type.  */
       ptrdiff_t offset;
       /* The offset (in bytes) to the caf_token associated with this
-	 component.  NULL, when not allocatable/pointer ref.  */
+         component.  NULL, when not allocatable/pointer ref.  */
       ptrdiff_t caf_token_offset;
     } c;
     struct {
       /* The mode of the array ref.  See CAF_ARR_REF_*.  */
       /* caf_array_ref_t, replaced by unsigend char to allow specification in
-	 fortran FE.  */
+         fortran FE.  */
       unsigned char mode[GFC_MAX_DIMENSIONS];
       /* The type of a static array.  Unset for array's with descriptors.  */
       int static_array_type;
       /* Subscript refs (s) or vector refs (v).  */
       union {
-	struct {
-	  /* The start and end boundary of the ref and the stride.  */
-	  ptrdiff_t start, end, stride;
-	} s;
-	struct {
-	  /* nvec entries of kind giving the elements to reference.  */
-	  void *vector;
-	  /* The number of entries in vector.  */
-	  size_t nvec;
-	  /* The integer kind used for the elements in vector.  */
-	  int kind;
-	} v;
+        struct {
+          /* The start and end boundary of the ref and the stride.  */
+          ptrdiff_t start, end, stride;
+        } s;
+        struct {
+          /* nvec entries of kind giving the elements to reference.  */
+          void *vector;
+          /* The number of entries in vector.  */
+          size_t nvec;
+          /* The integer kind used for the elements in vector.  */
+          int kind;
+        } v;
       } dim[GFC_MAX_DIMENSIONS];
     } a;
   } u;
@@ -235,7 +232,7 @@ int PREFIX (num_images) (int, int);
 
 #ifdef GCC_GE_7
 void PREFIX (register) (size_t, caf_register_t, caf_token_t *,
-			gfc_descriptor_t *, int *, char *, charlen_t);
+                        gfc_descriptor_t *, int *, char *, charlen_t);
 void PREFIX (deregister) (caf_token_t *, int, int *, char *, charlen_t);
 #else
 void * PREFIX (register) (size_t, caf_register_t, caf_token_t *, int *, char *,
@@ -293,17 +290,18 @@ void PREFIX (co_broadcast) (gfc_descriptor_t *, int, int *, char *, charlen_t);
 void PREFIX (co_max) (gfc_descriptor_t *, int, int *, char *, int, charlen_t);
 void PREFIX (co_min) (gfc_descriptor_t *, int, int *, char *, int, charlen_t);
 void PREFIX (co_reduce) (gfc_descriptor_t *, void *(*opr) (void *, void *),
-			 int, int, int *, char *, int , charlen_t);
+                         int, int, int *, char *, int , charlen_t);
 void PREFIX (co_sum) (gfc_descriptor_t *, int, int *, char *, charlen_t);
 
 void PREFIX (sync_all) (int *, char *, charlen_t);
 void PREFIX (sync_images) (int, int[], int *, char *, charlen_t);
 void PREFIX (sync_memory) (int *, char *, charlen_t);
 
-void PREFIX (stop_str) (const char *, charlen_t QUIETARG) __attribute__ ((noreturn));
+void PREFIX (stop_str) (const char *, charlen_t QUIETARG)
+                        __attribute__ ((noreturn));
 void PREFIX (stop) (int QUIETARG) __attribute__ ((noreturn));
 void PREFIX (error_stop_str) (const char *, charlen_t QUIETARG)
-     __attribute__ ((noreturn));
+                              __attribute__ ((noreturn));
 void PREFIX (error_stop) (int QUIETARG) __attribute__ ((noreturn));
 
 void PREFIX (fail_image) (void) __attribute__ ((noreturn));
@@ -321,9 +319,9 @@ void PREFIX (stopped_images) (gfc_descriptor_t *, int, int *);
 void PREFIX (atomic_define) (caf_token_t, size_t, int, void *, int *, int, int);
 void PREFIX (atomic_ref) (caf_token_t, size_t, int, void *, int *, int, int);
 void PREFIX (atomic_cas) (caf_token_t, size_t, int, void *, void *,
-			  void *, int *, int, int);
+                          void *, int *, int, int);
 void PREFIX (atomic_op) (int, caf_token_t, size_t, int, void *, void *,
-			 int *, int, int);
+                         int *, int, int);
 
 void PREFIX (lock) (caf_token_t, size_t, int, int *, int *, char *, charlen_t);
 void PREFIX (unlock) (caf_token_t, size_t, int, int *, char *, charlen_t);