1 files changed, 42 insertions, 6 deletions

diff --git a/gcc/fortran/gfortran.h b/gcc/fortran/gfortran.h
index 5ef7037..d85095c 100644
--- a/gcc/fortran/gfortran.h
+++ b/gcc/fortran/gfortran.h
@@ -721,6 +721,14 @@ enum gfc_isym_id
      remains compatible.  */
   GFC_ISYM_SU_KIND,
   GFC_ISYM_UINT,
+
+  GFC_ISYM_ACOSPI,
+  GFC_ISYM_ASINPI,
+  GFC_ISYM_ATANPI,
+  GFC_ISYM_ATAN2PI,
+  GFC_ISYM_COSPI,
+  GFC_ISYM_SINPI,
+  GFC_ISYM_TANPI,
 };
 
 enum init_local_logical
@@ -2020,14 +2028,13 @@ typedef struct gfc_symbol
   /* Set if this should be passed by value, but is not a VALUE argument
      according to the Fortran standard.  */
   unsigned pass_as_value:1;
-  /* Set if an allocatable array variable has been allocated in the current
-     scope. Used in the suppression of uninitialized warnings in reallocation
-     on assignment.  */
-  unsigned allocated_in_scope:1;
   /* Set if an external dummy argument is called with different argument lists.
      This is legal in Fortran, but can cause problems with autogenerated
      C prototypes for C23.  */
   unsigned ext_dummy_arglist_mismatch:1;
+  /* Set if the formal arglist has already been resolved, to avoid
+     trying to generate it again from actual arguments.  */
+  unsigned formal_resolved:1;
 
   /* Reference counter, used for memory management.
 
@@ -2177,6 +2184,7 @@ typedef struct gfc_symtree
     gfc_omp_udr *omp_udr;
   }
   n;
+  unsigned import_only:1;
 }
 gfc_symtree;
 
@@ -2204,6 +2212,17 @@ typedef struct gfc_was_finalized {
 }
 gfc_was_finalized;
 
+
+  /* Flag F2018 import status */
+enum importstate
+{ IMPORT_NOT_SET = 0,	/* Default condition.  */
+  IMPORT_F2008,		/* Old style IMPORT.  */
+  IMPORT_ONLY,		/* Import list used.  */
+  IMPORT_NONE,		/* No host association.  Unique in scoping unit.  */
+  IMPORT_ALL		/* Must be unique in the scoping unit.  */
+};
+
+
 /* A namespace describes the contents of procedure, module, interface block
    or BLOCK construct.  */
 /* ??? Anything else use these?  */
@@ -2317,6 +2336,10 @@ typedef struct gfc_namespace
   /* Set to 1 if namespace is an interface body with "IMPORT" used.  */
   unsigned has_import_set:1;
 
+  /* Flag F2018 import status */
+  ENUM_BITFIELD (importstate) import_state :3;
+
+
   /* Set to 1 if the namespace uses "IMPLICIT NONE (export)".  */
   unsigned has_implicit_none_export:1;
 
@@ -3162,6 +3185,11 @@ enum locality_type
   LOCALITY_NUM
 };
 
+struct sync_stat
+{
+  gfc_expr *stat, *errmsg;
+};
+
 typedef struct gfc_code
 {
   gfc_exec_op op;
@@ -3197,6 +3225,7 @@ typedef struct gfc_code
     gfc_omp_variant *omp_variants;
     bool omp_bool;
     int stop_code;
+    struct sync_stat sync_stat;
 
     struct
     {
@@ -3207,6 +3236,7 @@ typedef struct gfc_code
       unsigned arr_spec_from_expr3:1;
       /* expr3 is not explicit  */
       unsigned expr3_not_explicit:1;
+      struct sync_stat sync_stat;
     }
     alloc;
 
@@ -3215,6 +3245,7 @@ typedef struct gfc_code
       gfc_namespace *ns;
       gfc_association_list *assoc;
       gfc_case *case_list;
+      struct sync_stat sync_stat;
     }
     block;
 
@@ -3283,8 +3314,10 @@ typedef struct
   int flag_init_logical;
   int flag_init_character;
   char flag_init_character_value;
-  bool disable_omp_is_initial_device;
-  bool disable_acc_on_device;
+  bool disable_omp_is_initial_device:1;
+  bool disable_omp_get_initial_device:1;
+  bool disable_omp_get_num_devices:1;
+  bool disable_acc_on_device:1;
 
   int fpe;
   int fpe_summary;
@@ -3486,6 +3519,8 @@ void gfc_done_2 (void);
 
 int get_c_kind (const char *, CInteropKind_t *);
 
+const char * gfc_var_name_for_select_type_temp (gfc_expr *);
+
 const char *gfc_closest_fuzzy_match (const char *, char **);
 inline void
 vec_push (char **&optr, size_t &osz, const char *elt)
@@ -3985,6 +4020,7 @@ bool gfc_resolve_index (gfc_expr *, int);
 bool gfc_resolve_dim_arg (gfc_expr *);
 bool gfc_resolve_substring (gfc_ref *, bool *);
 void gfc_resolve_substring_charlen (gfc_expr *);
+void gfc_resolve_sync_stat (struct sync_stat *);
 gfc_expr *gfc_expr_to_initialize (gfc_expr *);
 bool gfc_type_is_extensible (gfc_symbol *);
 bool gfc_resolve_intrinsic (gfc_symbol *, locus *);