+2017-09-12 Paul Thomas <pault@gcc.gnu.org>
+
+ PR fortran/82173
+ PR fortran/82168
+ * decl.c (variable_decl): Check pdt template components for
+ appearance of KIND/LEN components in the type parameter name
+ list, that components corresponding to type parameters have
+ either KIND or LEN attributes and that KIND or LEN components
+ are scalar. Copy the initializer to the parameter value.
+ (gfc_get_pdt_instance): Add a label 'error_return' and follow
+ it with repeated code, while replacing this code with a jump.
+ Check if a parameter appears as a component in the template.
+ Make sure that the parameter expressions are integer. Validate
+ KIND expressions.
+ (gfc_match_decl_type_spec): Search for pdt_types in the parent
+ namespace since they are instantiated in the template ns.
+ * expr.c (gfc_extract_int): Use a KIND parameter if it
+ appears as a component expression.
+ (gfc_check_init_expr): Allow expressions with the pdt_kind
+ attribute.
+ *primary.c (gfc_match_actual_arglist): Make sure that the first
+ keyword argument is recognised when 'pdt' is set.
+
2017-09-10 Paul Thomas <pault@gcc.gnu.org>
PR fortran/34640
goto cleanup;
}
+ if (gfc_current_state () == COMP_DERIVED
+ && gfc_current_block ()->attr.pdt_template)
+ {
+ gfc_symbol *param;
+ gfc_find_symbol (name, gfc_current_block ()->f2k_derived,
+ 0, ¶m);
+ if (!param && (current_attr.pdt_kind || current_attr.pdt_len))
+ {
+ gfc_error ("The component with KIND or LEN attribute at %C does not "
+ "not appear in the type parameter list at %L",
+ &gfc_current_block ()->declared_at);
+ m = MATCH_ERROR;
+ goto cleanup;
+ }
+ else if (param && !(current_attr.pdt_kind || current_attr.pdt_len))
+ {
+ gfc_error ("The component at %C that appears in the type parameter "
+ "list at %L has neither the KIND nor LEN attribute",
+ &gfc_current_block ()->declared_at);
+ m = MATCH_ERROR;
+ goto cleanup;
+ }
+ else if (as && (current_attr.pdt_kind || current_attr.pdt_len))
+ {
+ gfc_error ("The component at %C which is a type parameter must be "
+ "a scalar");
+ m = MATCH_ERROR;
+ goto cleanup;
+ }
+ else if (param && initializer)
+ param->value = gfc_copy_expr (initializer);
+ }
+
/* Add the initializer. Note that it is fine if initializer is
NULL here, because we sometimes also need to check if a
declaration *must* have an initialization expression. */
{
gfc_error ("The type parameter spec list at %C cannot contain "
"both ASSUMED and DEFERRED parameters");
- gfc_free_actual_arglist (type_param_spec_list);
- return MATCH_ERROR;
+ goto error_return;
}
}
name_seen = true;
param = type_param_name_list->sym;
+ c1 = gfc_find_component (pdt, param->name, false, true, NULL);
+ if (!pdt->attr.use_assoc && !c1)
+ {
+ gfc_error ("The type parameter name list at %L contains a parameter "
+ "'%qs' , which is not declared as a component of the type",
+ &pdt->declared_at, param->name);
+ goto error_return;
+ }
+
kind_expr = NULL;
if (!name_seen)
{
- if (actual_param && actual_param->spec_type == SPEC_EXPLICIT)
+ if (!actual_param && !(c1 && c1->initializer))
+ {
+ gfc_error ("The type parameter spec list at %C does not contain "
+ "enough parameter expressions");
+ goto error_return;
+ }
+ else if (!actual_param && c1 && c1->initializer)
+ kind_expr = gfc_copy_expr (c1->initializer);
+ else if (actual_param && actual_param->spec_type == SPEC_EXPLICIT)
kind_expr = gfc_copy_expr (actual_param->expr);
}
else
{
gfc_error ("The derived parameter '%qs' at %C does not "
"have a default value", param->name);
- return MATCH_ERROR;
+ goto error_return;
}
}
}
if (kind_expr)
{
+ /* Variable expressions seem to default to BT_PROCEDURE.
+ TODO find out why this is and fix it. */
+ if (kind_expr->ts.type != BT_INTEGER
+ && kind_expr->ts.type != BT_PROCEDURE)
+ {
+ gfc_error ("The parameter expression at %C must be of "
+ "INTEGER type and not %s type",
+ gfc_basic_typename (kind_expr->ts.type));
+ goto error_return;
+ }
+
tail->expr = gfc_copy_expr (kind_expr);
/* Try simplification even for LEN expressions. */
gfc_simplify_expr (tail->expr, 1);
if (!param->attr.pdt_kind)
{
- if (!name_seen)
+ if (!name_seen && actual_param)
actual_param = actual_param->next;
if (kind_expr)
{
{
gfc_error ("The KIND parameter '%qs' at %C cannot either be "
"ASSUMED or DEFERRED", param->name);
- gfc_free_actual_arglist (type_param_spec_list);
- return MATCH_ERROR;
+ goto error_return;
}
if (!kind_expr || !gfc_is_constant_expr (kind_expr))
{
gfc_error ("The value for the KIND parameter '%qs' at %C does not "
"reduce to a constant expression", param->name);
- gfc_free_actual_arglist (type_param_spec_list);
- return MATCH_ERROR;
+ goto error_return;
}
gfc_extract_int (kind_expr, &kind_value);
gfc_free_expr (kind_expr);
}
+ if (!name_seen && actual_param)
+ {
+ gfc_error ("The type parameter spec list at %C contains too many "
+ "parameter expressions");
+ goto error_return;
+ }
+
/* Now we search for the PDT instance 'name'. If it doesn't exist, we
build it, using 'pdt' as a template. */
if (gfc_get_symbol (name, pdt->ns, &instance))
{
gfc_error ("Parameterized derived type at %C is ambiguous");
- return MATCH_ERROR;
+ goto error_return;
}
m = MATCH_YES;
gfc_error ("Maximum extension level reached with type %qs at %L",
c2->ts.u.derived->name,
&c2->ts.u.derived->declared_at);
- return MATCH_ERROR;
+ goto error_return;
}
instance->attr.extension = c2->ts.u.derived->attr.extension + 1;
gfc_insert_kind_parameter_exprs (e);
gfc_extract_int (e, &c2->ts.kind);
gfc_free_expr (e);
+ if (gfc_validate_kind (c2->ts.type, c2->ts.kind, true) < 0)
+ {
+ gfc_error ("Kind %d not supported for type %s at %C",
+ c2->ts.kind, gfc_basic_typename (c2->ts.type));
+ goto error_return;
+ }
}
/* Similarly, set the string length if parameterized. */
*ext_param_list = type_param_spec_list;
*sym = instance;
return m;
+
+error_return:
+ gfc_free_actual_arglist (type_param_spec_list);
+ return MATCH_ERROR;
}
}
if (sym->generic && !dt_sym)
dt_sym = gfc_find_dt_in_generic (sym);
+
+ /* Host associated PDTs can get confused with their constructors
+ because they ar instantiated in the template's namespace. */
+ if (!dt_sym)
+ {
+ if (gfc_find_symbol (dt_name, NULL, 1, &dt_sym))
+ {
+ gfc_error ("Type name %qs at %C is ambiguous", name);
+ return MATCH_ERROR;
+ }
+ if (dt_sym && !dt_sym->attr.pdt_type)
+ dt_sym = NULL;
+ }
}
else if (ts->kind == -1)
{
if (sym && sym->attr.flavor == FL_DERIVED
&& sym->attr.pdt_template
&& gfc_current_state () != COMP_DERIVED)
- {
- m = gfc_get_pdt_instance (decl_type_param_list, &sym, NULL);
- if (m != MATCH_YES)
- return m;
- gcc_assert (!sym->attr.pdt_template && sym->attr.pdt_type);
- ts->u.derived = sym;
- strcpy (name, gfc_dt_lower_string (sym->name));
- }
+ {
+ m = gfc_get_pdt_instance (decl_type_param_list, &sym, NULL);
+ if (m != MATCH_YES)
+ return m;
+ gcc_assert (!sym->attr.pdt_template && sym->attr.pdt_type);
+ ts->u.derived = sym;
+ strcpy (name, gfc_dt_lower_string (sym->name));
+ }
gfc_save_symbol_data (sym);
gfc_set_sym_referenced (sym);
bool
gfc_extract_int (gfc_expr *expr, int *result, int report_error)
{
+ gfc_ref *ref;
+
+ /* A KIND component is a parameter too. The expression for it
+ is stored in the initializer and should be consistent with
+ the tests below. */
+ if (gfc_expr_attr(expr).pdt_kind)
+ {
+ for (ref = expr->ref; ref; ref = ref->next)
+ {
+ if (ref->u.c.component->attr.pdt_kind)
+ expr = ref->u.c.component->initializer;
+ }
+ }
+
if (expr->expr_type != EXPR_CONSTANT)
{
if (report_error > 0)
t = true;
/* This occurs when parsing pdt templates. */
- if (e->symtree->n.sym->attr.pdt_kind)
+ if (gfc_expr_attr (e).pdt_kind)
break;
if (gfc_check_iter_variable (e))
if (sub_flag && !pdt && gfc_match_char ('*') == MATCH_YES)
{
- if (pdt)
- {
- tail->spec_type = SPEC_ASSUMED;
- goto next;
- }
m = gfc_match_st_label (&label);
if (m == MATCH_NO)
gfc_error ("Expected alternate return label at %C");
}
else
tail->spec_type = SPEC_EXPLICIT;
+
+ m = match_keyword_arg (tail, head, pdt);
+ if (m == MATCH_YES)
+ {
+ seen_keyword = 1;
+ goto next;
+ }
+ if (m == MATCH_ERROR)
+ goto cleanup;
}
/* After the first keyword argument is seen, the following
sym->ts.f90_type = sym->ts.type;
}
}
-
+
return true;
}
case FL_NAMELIST:
gfc_error ("Namelist group name at %L cannot have the "
"SAVE attribute", where);
- return false;
+ return false;
case FL_PROCEDURE:
/* Conflicts between SAVE and PROCEDURE will be checked at
resolution stage, see "resolve_fl_procedure". */
if ((attr->if_source == IFSRC_DECL && !attr->procedure) || attr->contained)
conf (external, subroutine);
- if (attr->proc_pointer && !gfc_notify_std (GFC_STD_F2003,
+ if (attr->proc_pointer && !gfc_notify_std (GFC_STD_F2003,
"Procedure pointer at %C"))
return false;
if (attr->is_protected)
{
- if (!gfc_notify_std (GFC_STD_LEGACY,
- "Duplicate PROTECTED attribute specified at %L",
+ if (!gfc_notify_std (GFC_STD_LEGACY,
+ "Duplicate PROTECTED attribute specified at %L",
where))
return false;
}
if (s == SAVE_EXPLICIT && attr->save == SAVE_EXPLICIT)
{
- if (!gfc_notify_std (GFC_STD_LEGACY,
- "Duplicate SAVE attribute specified at %L",
+ if (!gfc_notify_std (GFC_STD_LEGACY,
+ "Duplicate SAVE attribute specified at %L",
where))
return false;
}
if (attr->value)
{
- if (!gfc_notify_std (GFC_STD_LEGACY,
- "Duplicate VALUE attribute specified at %L",
+ if (!gfc_notify_std (GFC_STD_LEGACY,
+ "Duplicate VALUE attribute specified at %L",
where))
return false;
}
given a VOLATILE attribute - unless it is a coarray (F2008, C560). */
if (attr->volatile_ && attr->volatile_ns == gfc_current_ns)
- if (!gfc_notify_std (GFC_STD_LEGACY,
- "Duplicate VOLATILE attribute specified at %L",
+ if (!gfc_notify_std (GFC_STD_LEGACY,
+ "Duplicate VOLATILE attribute specified at %L",
where))
return false;
given a ASYNCHRONOUS attribute. */
if (attr->asynchronous && attr->asynchronous_ns == gfc_current_ns)
- if (!gfc_notify_std (GFC_STD_LEGACY,
- "Duplicate ASYNCHRONOUS attribute specified at %L",
+ if (!gfc_notify_std (GFC_STD_LEGACY,
+ "Duplicate ASYNCHRONOUS attribute specified at %L",
where))
return false;
gfc_error_now ("Duplicate BIND attribute specified at %L", where);
else
attr->is_bind_c = 1;
-
+
if (where == NULL)
where = &gfc_current_locus;
-
+
if (!gfc_notify_std (GFC_STD_F2003, "BIND(C) at %L", where))
return false;
gfc_copy_attr (symbol_attribute *dest, symbol_attribute *src, locus *where)
{
int is_proc_lang_bind_spec;
-
+
/* In line with the other attributes, we only add bits but do not remove
them; cf. also PR 41034. */
dest->ext_attr |= src->ext_attr;
dest->is_c_interop = 1;
if (src->is_iso_c)
dest->is_iso_c = 1;
-
+
if (src->external && !gfc_add_external (dest, where))
goto fail;
if (src->intrinsic && !gfc_add_intrinsic (dest, where))
not found or the components are private. If noaccess is set, no access
checks are done. If silent is set, an error will not be generated if
the component cannot be found or accessed.
-
+
If ref is not NULL, *ref is set to represent the chain of components
required to get to the ultimate component.
free_st_labels (label->left);
free_st_labels (label->right);
-
+
if (label->format != NULL)
gfc_free_expr (label->format);
free (label);
p->f2k_derived = NULL;
p->assoc = NULL;
p->fn_result_spec = 0;
-
+
return p;
}
return st;
result = find_common_symtree (st->left, head);
- if (!result)
+ if (!result)
result = find_common_symtree (st->right, head);
return result;
/* Restore previous state of symbol. Just copy simple stuff. */
-
+
static void
restore_old_symbol (gfc_symbol *p)
{
if (sym->old_symbol == NULL)
return;
- if (sym->old_symbol->as != sym->as)
+ if (sym->old_symbol->as != sym->as)
gfc_free_array_spec (sym->old_symbol->as);
- if (sym->old_symbol->value != sym->value)
+ if (sym->old_symbol->value != sym->value)
gfc_free_expr (sym->old_symbol->value);
if (sym->old_symbol->formal != sym->formal)
free_common_tree (common_tree->right);
free (common_tree);
-}
+}
/* Recursive function that deletes an entire tree and all the common
}
-/* Free the charlen list from cl to end (end is not freed).
+/* Free the charlen list from cl to end (end is not freed).
Free the whole list if end is NULL. */
void
gcc_assert ((st_func && !sym_func) || (!st_func && sym_func));
nodes = count_st_nodes (st);
st_vec = XALLOCAVEC (gfc_symtree *, nodes);
- node_cntr = 0;
+ node_cntr = 0;
fill_st_vector (st, st_vec, node_cntr);
if (sym_func)
gfc_component *curr_comp = NULL;
bool is_c_interop = false;
bool retval = true;
-
+
if (derived_sym == NULL)
gfc_internal_error ("verify_bind_c_derived_type(): Given symbol is "
"unexpectedly NULL");
so we don't repeat warnings/errors. */
if (derived_sym->ts.is_c_interop)
return true;
-
+
/* The derived type must have the BIND attribute to be interoperable
J3/04-007, Section 15.2.3. */
if (derived_sym->attr.is_bind_c != 1)
&(derived_sym->declared_at));
retval = false;
}
-
+
curr_comp = derived_sym->components;
/* Fortran 2003 allows an empty derived type. C99 appears to disallow an
/* Initialize the derived type as being C interoperable.
If we find an error in the components, this will be set false. */
derived_sym->ts.is_c_interop = 1;
-
+
/* Loop through the list of components to verify that the kind of
each is a C interoperable type. */
do
{
- /* The components cannot be pointers (fortran sense).
+ /* The components cannot be pointers (fortran sense).
J3/04-007, Section 15.2.3, C1505. */
if (curr_comp->attr.pointer != 0)
{
derived_sym->name, &(derived_sym->declared_at));
retval = false;
}
-
+
/* BIND(C) derived types must have interoperable components. */
if (curr_comp->ts.type == BT_DERIVED
- && curr_comp->ts.u.derived->ts.is_iso_c != 1
+ && curr_comp->ts.u.derived->ts.is_iso_c != 1
&& curr_comp->ts.u.derived != derived_sym)
{
/* This should be allowed; the draft says a derived-type can not
}
else
{
- /* Grab the typespec for the given component and test the kind. */
+ /* Grab the typespec for the given component and test the kind. */
is_c_interop = gfc_verify_c_interop (&(curr_comp->ts));
-
+
if (!is_c_interop)
{
/* Report warning and continue since not fatal. The
&(curr_comp->loc));
}
}
-
+
curr_comp = curr_comp->next;
- } while (curr_comp != NULL);
+ } while (curr_comp != NULL);
/* Make sure we don't have conflicts with the attributes. */
it's interoperable. */
if (!retval)
derived_sym->ts.is_c_interop = 0;
-
+
return retval;
}
tmp_sym->ts.f90_type = BT_VOID;
tmp_sym->attr.flavor = FL_PARAMETER;
tmp_sym->ts.u.derived = dt_symtree->n.sym;
-
+
/* Set the c_address field of c_null_ptr and c_null_funptr to
the value of NULL. */
tmp_sym->value = gfc_get_expr ();
(*tail)->next = formal_arg;
(*tail) = formal_arg;
}
-
+
(*tail)->sym = param_sym;
(*tail)->next = NULL;
-
+
return;
}
switch (s)
{
-#define NAMED_INTCST(a,b,c,d) case a :
+#define NAMED_INTCST(a,b,c,d) case a :
#define NAMED_REALCST(a,b,c,d) case a :
#define NAMED_CMPXCST(a,b,c,d) case a :
#define NAMED_LOGCST(a,b,c) case a :
+2017-09-12 Paul Thomas <pault@gcc.gnu.org>
+
+ PR fortran/82173
+ * gfortran.dg/pdt_4.f03 : Remove the 'is being used before it
+ is defined' error.
+ * gfortran.dg/pdt_6.f03 : New test.
+ * gfortran.dg/pdt_7.f03 : New test.
+ * gfortran.dg/pdt_8.f03 : New test.
+
+ PR fortran/82168
+ * gfortran.dg/pdt_9.f03 : New test.
+
2017-09-12 Jakub Jelinek <jakub@redhat.com>
PR target/82112
end select
deallocate (cz)
contains
- subroutine foo(arg) ! { dg-error "has no IMPLICIT type" }
- type (mytype(4, *)) :: arg ! { dg-error "is being used before it is defined" }
+ subroutine foo(arg)
+ type (mytype(4, *)) :: arg ! used to have an invalid "is being used before it is defined"
end subroutine
subroutine bar(arg) ! { dg-error "cannot have DEFERRED type parameters" }
type (thytype(8, :, 4) :: arg
--- /dev/null
+! { dg-do compile }
+!
+! Fixes of ICE on invalid & accepts invalid
+!
+! Contributed by Janus Weil <janus@gcc.gnu.org>
+!
+implicit none
+
+type :: param_matrix(c,r)
+ integer, len :: c,r
+ real :: m(c,r)
+end type
+
+type real_array(k)
+ integer, kind :: k
+ real(kind=k), allocatable :: r(:)
+end type
+
+type(param_matrix(1)) :: m1 ! { dg-error "does not contain enough parameter" }
+type(param_matrix(1,2)) :: m2 ! ok
+type(param_matrix(1,2,3)) :: m3 ! { dg-error "contains too many parameter" }
+type(param_matrix(1,2.5)) :: m4 ! { dg-error "must be of INTEGER type" }
+
+type(real_array(4)) :: a1 ! ok
+type(real_array(5)) :: a2 ! { dg-error "Kind 5 not supported for type REAL" }
+end
--- /dev/null
+! { dg-do run }
+!
+! Rejected valid
+!
+! ! Contributed by Janus Weil <janus@gcc.gnu.org>
+!
+implicit none
+
+type :: param_matrix(k,c,r)
+ integer, kind :: k
+ integer, len :: c,r
+ real(kind=k) :: m(c,r)
+end type
+
+type(param_matrix(8,3,2)) :: mat
+real(kind=mat%k) :: m ! Corrected error: Parameter ‘mat’ at (1) has not been declared or ...
+
+if (kind(m) .ne. 8) call abort
+
+end
--- /dev/null
+! { dg-do compile }
+!
+! Fixes of "accepts invalid".
+! Note that the undeclared parameter 'y' in 't1' was originally in the
+! type 't'. It turned out to be convenient to defer the error until the
+! type is used in the declaration of 'z'.
+!
+! Contributed by Janus Weil <janus@gcc.gnu.org>
+!
+implicit none
+type :: t(i,a,x) ! { dg-error "does not|has neither" }
+ integer, kind :: k ! { dg-error "does not not appear in the type parameter list" }
+ integer :: i ! { dg-error "has neither the KIND nor LEN attribute" }
+ integer, kind :: a(3) ! { dg-error "must be a scalar" }
+ real, kind :: x ! { dg-error "must be INTEGER" }
+end type
+
+type :: t1(k,y) ! { dg-error "not declared as a component of the type" }
+ integer, kind :: k
+end type
+
+type(t1(4,4)) :: z
+end
--- /dev/null
+! { dg-do compile }
+!
+! Test the fix for PR82168 in which the declarations for 'a'
+! and 'b' threw errors even though they are valid.
+!
+! Contributed by <physiker@toast2.net>
+!
+module mod
+ implicit none
+ integer, parameter :: dp = kind (0.0d0)
+ type, public :: v(z, k)
+ integer, len :: z
+ integer, kind :: k = kind(0.0)
+ real(kind = k) :: e(z)
+ end type v
+end module mod
+
+program bug
+ use mod
+ implicit none
+ type (v(2)) :: a ! Missing parameter replaced by initializer.
+ type (v(z=:, k=dp)), allocatable :: b ! Keyword was not working for '*' or ':'
+end program bug
projects / gcc.git / commitdiff