Revert "Merge pull request #8 from sourceryinstitute/teams"

This reverts commit 71c41bf, reversing
changes made to 7204ca4.

Author: Damian Rouson

gcc/fortran/array.c

@@ -158,8 +158,7 @@ gfc_match_array_ref (gfc_array_ref *ar, gfc_array_spec *as, int init,
   bool matched_bracket = false;
   gfc_expr *tmp;
   bool stat_just_seen = false;
-  bool team_just_seen = false;
-  
+
   memset (ar, '\0', sizeof (*ar));
 
   ar->where = gfc_current_locus;
@@ -231,21 +230,7 @@ gfc_match_array_ref (gfc_array_ref *ar, gfc_array_spec *as, int init,
       if (m == MATCH_ERROR)
 	return MATCH_ERROR;
 
-      team_just_seen = false;
       stat_just_seen = false;
-
-      if (gfc_match(" , team = %e",&tmp) == MATCH_YES && ar->stat == NULL)
-	{
-	  ar->team = tmp;
-	  team_just_seen = true;
-	}
-
-      if (ar->team && !team_just_seen)
-	{
-	  gfc_error ("TEAM= attribute in %C misplaced");
-	  return MATCH_ERROR;
-	}
-      
       if (gfc_match(" , stat = %e",&tmp) == MATCH_YES && ar->stat == NULL)
 	{
 	  ar->stat = tmp;

gcc/fortran/check.c

@@ -1213,20 +1213,6 @@ gfc_check_failed_or_stopped_images (gfc_expr *team, gfc_expr *kind)
   return true;
 }
 
-bool
-gfc_check_get_team (gfc_expr *level)
-{
-  if (level)
-    {
-      gfc_error ("%qs argument of %qs intrinsic at %L not yet supported",
-		 gfc_current_intrinsic_arg[0]->name, gfc_current_intrinsic,
-		 &level->where);
-      return false;
-    }
-
-  return true;
-}
-
 
 bool
 gfc_check_atomic_cas (gfc_expr *atom, gfc_expr *old, gfc_expr *compare,

gcc/fortran/dump-parse-tree.c

@@ -1869,22 +1869,6 @@ show_code_node (int level, gfc_code *c)
       fputs ("FAIL IMAGE ", dumpfile);
       break;
 
-    case EXEC_CHANGE_TEAM:
-      fputs ("CHANGE TEAM", dumpfile);
-      break;
-
-    case EXEC_END_TEAM:
-      fputs ("END TEAM", dumpfile);
-      break;
-
-    case EXEC_FORM_TEAM:
-      fputs ("FORM TEAM", dumpfile);
-      break;
-
-    case EXEC_SYNC_TEAM:
-      fputs ("SYNC TEAM", dumpfile);
-      break;
-
     case EXEC_SYNC_ALL:
       fputs ("SYNC ALL ", dumpfile);
       if (c->expr2 != NULL)

gcc/fortran/expr.c

@@ -4982,24 +4982,6 @@ gfc_ref_this_image (gfc_ref *ref)
   return true;
 }
 
-gfc_expr *
-gfc_find_team_co(gfc_expr *e)
-{
-  gfc_ref *ref;
-
-  for (ref = e->ref; ref; ref = ref->next)
-    if (ref->type == REF_ARRAY && ref->u.ar.codimen > 0)
-      return ref->u.ar.team;
-
-  if (e->value.function.actual->expr)
-    for (ref = e->value.function.actual->expr->ref; ref;
-	 ref = ref->next)
-      if (ref->type == REF_ARRAY && ref->u.ar.codimen > 0)
-	return ref->u.ar.team;
-
-  return NULL;
-}
-
 gfc_expr *
 gfc_find_stat_co(gfc_expr *e)
 {

gcc/fortran/gfortran.h

@@ -263,8 +263,7 @@ enum gfc_statement
   ST_OMP_TASKLOOP_SIMD, ST_OMP_END_TASKLOOP_SIMD, ST_OMP_ORDERED_DEPEND,
   ST_PROCEDURE, ST_GENERIC, ST_CRITICAL, ST_END_CRITICAL,
   ST_GET_FCN_CHARACTERISTICS, ST_LOCK, ST_UNLOCK, ST_EVENT_POST,
-  ST_EVENT_WAIT, ST_FAIL_IMAGE, ST_FORM_TEAM, ST_CHANGE_TEAM,
-  ST_END_TEAM, ST_SYNC_TEAM, ST_NONE
+  ST_EVENT_WAIT,ST_FAIL_IMAGE,ST_NONE
 };
 
 /* Types of interfaces that we can have.  Assignment interfaces are
@@ -457,7 +456,6 @@ enum gfc_isym_id
   GFC_ISYM_GETLOG,
   GFC_ISYM_GETPID,
   GFC_ISYM_GETUID,
-  GFC_ISYM_GET_TEAM,
   GFC_ISYM_GMTIME,
   GFC_ISYM_HOSTNM,
   GFC_ISYM_HUGE,
@@ -1915,7 +1913,6 @@ typedef struct gfc_array_ref
   int dimen;			/* # of components in the reference */
   int codimen;
   bool in_allocate;		/* For coarray checks. */
-  gfc_expr *team;
   gfc_expr *stat;
   locus where;
   gfc_array_spec *as;
@@ -2491,7 +2488,6 @@ enum gfc_exec_op
   EXEC_OPEN, EXEC_CLOSE, EXEC_WAIT,
   EXEC_READ, EXEC_WRITE, EXEC_IOLENGTH, EXEC_TRANSFER, EXEC_DT_END,
   EXEC_BACKSPACE, EXEC_ENDFILE, EXEC_INQUIRE, EXEC_REWIND, EXEC_FLUSH,
-  EXEC_FORM_TEAM, EXEC_CHANGE_TEAM, EXEC_END_TEAM, EXEC_SYNC_TEAM,
   EXEC_LOCK, EXEC_UNLOCK, EXEC_EVENT_POST, EXEC_EVENT_WAIT, EXEC_FAIL_IMAGE,
   EXEC_OACC_KERNELS_LOOP, EXEC_OACC_PARALLEL_LOOP, EXEC_OACC_ROUTINE,
   EXEC_OACC_PARALLEL, EXEC_OACC_KERNELS, EXEC_OACC_DATA, EXEC_OACC_HOST_DATA,
@@ -3206,7 +3202,6 @@ bool gfc_is_coarray (gfc_expr *);
 int gfc_get_corank (gfc_expr *);
 bool gfc_has_ultimate_allocatable (gfc_expr *);
 bool gfc_has_ultimate_pointer (gfc_expr *);
-gfc_expr* gfc_find_team_co (gfc_expr *);
 gfc_expr* gfc_find_stat_co (gfc_expr *);
 gfc_expr* gfc_build_intrinsic_call (gfc_namespace *, gfc_isym_id, const char*,
 				    locus, unsigned, ...);

gcc/fortran/intrinsic.c

@@ -1938,13 +1938,6 @@ add_functions (void)
 
   make_generic ("getpid", GFC_ISYM_GETPID, GFC_STD_GNU);
 
-  add_sym_1 ("get_team", GFC_ISYM_GET_TEAM, CLASS_TRANSFORMATIONAL,
-	     ACTUAL_NO, BT_INTEGER, di, GFC_STD_F2008_TS,
-	     gfc_check_get_team,
-	     NULL,
-	     gfc_resolve_get_team,
-	     "level", BT_INTEGER, di, OPTIONAL);
-
   add_sym_0 ("getuid", GFC_ISYM_GETUID, CLASS_IMPURE, ACTUAL_NO, BT_INTEGER,
 	     di, GFC_STD_GNU, NULL, NULL, gfc_resolve_getuid);
 

gcc/fortran/intrinsic.h

@@ -83,7 +83,6 @@ bool gfc_check_fn_r (gfc_expr *);
 bool gfc_check_fn_rc (gfc_expr *);
 bool gfc_check_fn_rc2008 (gfc_expr *);
 bool gfc_check_fnum (gfc_expr *);
-bool gfc_check_get_team (gfc_expr *);
 bool gfc_check_hostnm (gfc_expr *);
 bool gfc_check_huge (gfc_expr *);
 bool gfc_check_hypot (gfc_expr *, gfc_expr *);
@@ -300,7 +299,6 @@ gfc_expr *gfc_simplify_float (gfc_expr *);
 gfc_expr *gfc_simplify_floor (gfc_expr *, gfc_expr *);
 gfc_expr *gfc_simplify_fraction (gfc_expr *);
 gfc_expr *gfc_simplify_gamma (gfc_expr *);
-gfc_expr *gfc_simplify_get_team (gfc_expr *);
 gfc_expr *gfc_simplify_huge (gfc_expr *);
 gfc_expr *gfc_simplify_hypot (gfc_expr *, gfc_expr *);
 gfc_expr *gfc_simplify_iachar (gfc_expr *, gfc_expr *);
@@ -495,7 +493,6 @@ void gfc_resolve_gamma (gfc_expr *, gfc_expr *);
 void gfc_resolve_getcwd (gfc_expr *, gfc_expr *);
 void gfc_resolve_getgid (gfc_expr *);
 void gfc_resolve_getpid (gfc_expr *);
-void gfc_resolve_get_team (gfc_expr *, gfc_expr *);
 void gfc_resolve_getuid (gfc_expr *);
 void gfc_resolve_hostnm (gfc_expr *, gfc_expr *);
 void gfc_resolve_hypot (gfc_expr *, gfc_expr *, gfc_expr *);

gcc/fortran/iresolve.c

@@ -2859,18 +2859,6 @@ gfc_resolve_image_status (gfc_expr *f, gfc_expr *image ATTRIBUTE_UNUSED,
   f->value.function.name = image_status;
 }
 
-/* Resolve get_team ().  */
-
-void
-gfc_resolve_get_team (gfc_expr *f, gfc_expr *level ATTRIBUTE_UNUSED)
-{
-  static char get_team[] = "_gfortran_caf_get_team";
-  f->rank = 0;
-  f->ts.type = BT_INTEGER;
-  f->ts.kind = gfc_default_integer_kind;
-  f->value.function.name = get_team;
-}
-
 
 /* Resolve image_index (...).  */
 

gcc/fortran/iso-fortran-env.def

@@ -125,12 +125,7 @@ NAMED_DERIVED_TYPE (ISOFORTRAN_LOCK_TYPE, "lock_type", \
 
 NAMED_DERIVED_TYPE (ISOFORTRAN_EVENT_TYPE, "event_type", \
 		    flag_coarray == GFC_FCOARRAY_LIB
-		    ? get_int_kind_from_node (ptr_type_node)
-		    : gfc_default_integer_kind, GFC_STD_F2008_TS)
-
-NAMED_DERIVED_TYPE (ISOFORTRAN_TEAM_TYPE, "team_type", \
-		    flag_coarray == GFC_FCOARRAY_LIB
-		    ? get_int_kind_from_node (ptr_type_node)
+		    ?  get_int_kind_from_node (ptr_type_node)
 		    : gfc_default_integer_kind, GFC_STD_F2008_TS)
 
 #undef NAMED_INTCST

gcc/fortran/match.c

@@ -1595,19 +1595,16 @@ gfc_match_if (gfc_statement *if_type)
   match ("assign", gfc_match_assign, ST_LABEL_ASSIGNMENT)
   match ("backspace", gfc_match_backspace, ST_BACKSPACE)
   match ("call", gfc_match_call, ST_CALL)
-  match ("change team", gfc_match_change_team, ST_CHANGE_TEAM)
   match ("close", gfc_match_close, ST_CLOSE)
   match ("continue", gfc_match_continue, ST_CONTINUE)
   match ("cycle", gfc_match_cycle, ST_CYCLE)
   match ("deallocate", gfc_match_deallocate, ST_DEALLOCATE)
   match ("end file", gfc_match_endfile, ST_END_FILE)
-  match ("end team", gfc_match_end_team, ST_END_TEAM)
   match ("error stop", gfc_match_error_stop, ST_ERROR_STOP)
   match ("event post", gfc_match_event_post, ST_EVENT_POST)
   match ("event wait", gfc_match_event_wait, ST_EVENT_WAIT)
   match ("exit", gfc_match_exit, ST_EXIT)
   match ("fail image", gfc_match_fail_image, ST_FAIL_IMAGE)
-  match ("form team", gfc_match_form_team, ST_FORM_TEAM)
   match ("flush", gfc_match_flush, ST_FLUSH)
   match ("forall", match_simple_forall, ST_FORALL)
   match ("go to", gfc_match_goto, ST_GOTO)
@@ -1623,7 +1620,6 @@ gfc_match_if (gfc_statement *if_type)
   match ("rewind", gfc_match_rewind, ST_REWIND)
   match ("stop", gfc_match_stop, ST_STOP)
   match ("wait", gfc_match_wait, ST_WAIT)
-  match ("sync team", gfc_match_sync_team, ST_SYNC_TEAM)
   match ("sync all", gfc_match_sync_all, ST_SYNC_CALL);
   match ("sync images", gfc_match_sync_images, ST_SYNC_IMAGES);
   match ("sync memory", gfc_match_sync_memory, ST_SYNC_MEMORY);
@@ -1663,6 +1659,7 @@ gfc_match_if (gfc_statement *if_type)
       gfc_free_expr (expr);
       return MATCH_ERROR;
     }
+
   /* At this point, we've matched the single IF and the action clause
      is in new_st.  Rearrange things so that the IF statement appears
      in new_st.  */
@@ -3346,136 +3343,6 @@ gfc_match_fail_image (void)
   return MATCH_ERROR;
 }
 
-/* Match a FORM TEAM statement.  */
-
-match
-gfc_match_form_team (void)
-{
-  match m;
-  gfc_expr *teamid,*team;
-
-  if (!gfc_notify_std (GFC_STD_F2008_TS, "FORM TEAM statement at %C"))
-    return MATCH_ERROR;
-
-  if (gfc_match_char ('(') == MATCH_NO)
-    goto syntax;
-  
-  new_st.op = EXEC_FORM_TEAM;
-
-  if (gfc_match ("%e", &teamid) != MATCH_YES)
-    goto syntax;
-  m = gfc_match_char (',');
-  if (m == MATCH_ERROR)
-    goto syntax;
-  if (gfc_match ("%e", &team) != MATCH_YES)
-    goto syntax;
-
-  m = gfc_match_char (')');
-  if (m == MATCH_NO)
-    goto syntax;
-
-  new_st.expr1 = teamid;
-  new_st.expr2 = team;
-
-  return MATCH_YES;
-
-syntax:
-  gfc_syntax_error (ST_FORM_TEAM);
-
-  return MATCH_ERROR;
-}
-
-/* Match a CHANGE TEAM statement.  */
-
-match
-gfc_match_change_team (void)
-{
-  match m;
-  gfc_expr *team;
-
-  if (!gfc_notify_std (GFC_STD_F2008_TS, "CHANGE TEAM statement at %C"))
-    return MATCH_ERROR;
-
-  if (gfc_match_char ('(') == MATCH_NO)
-    goto syntax;
-  
-  new_st.op = EXEC_CHANGE_TEAM;
-
-  /* if (gfc_match ("%e", &teamid) != MATCH_YES) */
-  /*   goto syntax; */
-  /* m = gfc_match_char (','); */
-  /* if (m == MATCH_ERROR) */
-  /*   goto syntax; */
-  if (gfc_match ("%e", &team) != MATCH_YES)
-    goto syntax;
-
-  m = gfc_match_char (')');
-  if (m == MATCH_NO)
-    goto syntax;
-
-  new_st.expr1 = team;
-
-  return MATCH_YES;
-
-syntax:
-  gfc_syntax_error (ST_CHANGE_TEAM);
-
-  return MATCH_ERROR;
-}
-
-/* Match a END TEAM statement.  */
-
-match
-gfc_match_end_team (void)
-{
-  if (!gfc_notify_std (GFC_STD_F2008_TS, "END TEAM statement at %C"))
-    return MATCH_ERROR;
-
-  if (gfc_match_char ('(') == MATCH_YES)
-    goto syntax;
-  
-  new_st.op = EXEC_END_TEAM;
-
-  return MATCH_YES;
-
-syntax:
-  gfc_syntax_error (ST_END_TEAM);
-
-  return MATCH_ERROR;
-}
-
-/* Match a SYNC TEAM statement.  */
-
-match
-gfc_match_sync_team (void)
-{
-  match m;
-  gfc_expr *team;
-
-  if (!gfc_notify_std (GFC_STD_F2008_TS, "SYNC TEAM statement at %C"))
-    return MATCH_ERROR;
-
-  if (gfc_match_char ('(') == MATCH_NO)
-    goto syntax;
-  
-  new_st.op = EXEC_SYNC_TEAM;
-
-  if (gfc_match ("%e", &team) != MATCH_YES)
-    goto syntax;
-
-  m = gfc_match_char (')');
-  if (m == MATCH_NO)
-    goto syntax;
-
-  new_st.expr1 = team;
-
-  return MATCH_YES;
-
-syntax:
-  gfc_syntax_error (ST_SYNC_TEAM);
-
-  return MATCH_ERROR;
-}
 
 /* Match LOCK/UNLOCK statement. Syntax:
      LOCK ( lock-variable [ , lock-stat-list ] )