From: dfranke Date: Fri, 6 Jul 2007 12:37:22 +0000 (+0000) Subject: gcc/fortran: X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=commitdiff_plain;h=3cd3c66792ab7ee6d75d168f1e065f26bcba2e30 gcc/fortran: 2007-05-06 Daniel Franke PR fortran/32633 * symbol.c (save_status): New. * gfortran.h (save_status): Added external declaration. (check_conflict): Check for conflicting explicite SAVE statements only. (gen_special_c_interop_ptr): Use SAVE_EXPLICIT constant. * module.c (ab_attribute, attr_bits): Removed enumerator value AB_SAVE for save attribute. (mio_symbol_attribute): Import/export the full SAVE status, removed usage of AB_SAVE. * dump-parse-tree.c (gfc_show_attr): Dump full SAVE status. * decl.c (add_init_expr_to_sym): Set SAVE_IMPLICIT only if not already explicit. gcc/testsuite: 2007-07-06 Daniel Franke * gfortran.dg/save_parameter.f90: New test. * gfortran.dg/module_md5_1.f90: Updated MD5 sum. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@126413 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 0173eb3d7ca..e21010064bf 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,19 @@ +2007-05-06 Daniel Franke + + PR fortran/32633 + * symbol.c (save_status): New. + * gfortran.h (save_status): Added external declaration. + (check_conflict): Check for conflicting explicite SAVE statements + only. + (gen_special_c_interop_ptr): Use SAVE_EXPLICIT constant. + * module.c (ab_attribute, attr_bits): Removed enumerator value + AB_SAVE for save attribute. + (mio_symbol_attribute): Import/export the full SAVE status, + removed usage of AB_SAVE. + * dump-parse-tree.c (gfc_show_attr): Dump full SAVE status. + * decl.c (add_init_expr_to_sym): Set SAVE_IMPLICIT only if not + already explicit. + 2007-07-05 Daniel Franke Tobias Burnus diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index 2c828bab08b..f103376562f 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -1232,7 +1232,8 @@ add_init_expr_to_sym (const char *name, gfc_expr **initp, locus *var_locus) } sym->value = init; - sym->attr.save = SAVE_IMPLICIT; + if (sym->attr.save == SAVE_NONE) + sym->attr.save = SAVE_IMPLICIT; *initp = NULL; } diff --git a/gcc/fortran/dump-parse-tree.c b/gcc/fortran/dump-parse-tree.c index 5d26a78af1b..5d181e2ab24 100644 --- a/gcc/fortran/dump-parse-tree.c +++ b/gcc/fortran/dump-parse-tree.c @@ -542,10 +542,11 @@ void gfc_show_attr (symbol_attribute *attr) { - gfc_status ("(%s %s %s %s", gfc_code2string (flavors, attr->flavor), + gfc_status ("(%s %s %s %s %s", gfc_code2string (flavors, attr->flavor), gfc_intent_string (attr->intent), gfc_code2string (access_types, attr->access), - gfc_code2string (procedures, attr->proc)); + gfc_code2string (procedures, attr->proc), + gfc_code2string (save_status, attr->save)); if (attr->allocatable) gfc_status (" ALLOCATABLE"); @@ -561,8 +562,6 @@ gfc_show_attr (symbol_attribute *attr) gfc_status (" POINTER"); if (attr->protected) gfc_status (" PROTECTED"); - if (attr->save) - gfc_status (" SAVE"); if (attr->value) gfc_status (" VALUE"); if (attr->volatile_) diff --git a/gcc/fortran/gfortran.h b/gcc/fortran/gfortran.h index 3c15c61a02e..6e2ee7b4141 100644 --- a/gcc/fortran/gfortran.h +++ b/gcc/fortran/gfortran.h @@ -311,6 +311,7 @@ extern const mstring procedures[]; extern const mstring intents[]; extern const mstring access_types[]; extern const mstring ifsrc_types[]; +extern const mstring save_status[]; /* Enumeration of all the generic intrinsic functions. Used by the backend for identification of a function. */ diff --git a/gcc/fortran/module.c b/gcc/fortran/module.c index 665f6a11088..94e6392634f 100644 --- a/gcc/fortran/module.c +++ b/gcc/fortran/module.c @@ -1512,7 +1512,7 @@ mio_internal_string (char *string) typedef enum { AB_ALLOCATABLE, AB_DIMENSION, AB_EXTERNAL, AB_INTRINSIC, AB_OPTIONAL, - AB_POINTER, AB_SAVE, AB_TARGET, AB_DUMMY, AB_RESULT, AB_DATA, + AB_POINTER, AB_TARGET, AB_DUMMY, AB_RESULT, AB_DATA, AB_IN_NAMELIST, AB_IN_COMMON, AB_FUNCTION, AB_SUBROUTINE, AB_SEQUENCE, AB_ELEMENTAL, AB_PURE, AB_RECURSIVE, AB_GENERIC, AB_ALWAYS_EXPLICIT, AB_CRAY_POINTER, AB_CRAY_POINTEE, AB_THREADPRIVATE, AB_ALLOC_COMP, @@ -1529,7 +1529,6 @@ static const mstring attr_bits[] = minit ("INTRINSIC", AB_INTRINSIC), minit ("OPTIONAL", AB_OPTIONAL), minit ("POINTER", AB_POINTER), - minit ("SAVE", AB_SAVE), minit ("VOLATILE", AB_VOLATILE), minit ("TARGET", AB_TARGET), minit ("THREADPRIVATE", AB_THREADPRIVATE), @@ -1567,6 +1566,7 @@ DECL_MIO_NAME (expr_t) DECL_MIO_NAME (gfc_access) DECL_MIO_NAME (gfc_intrinsic_op) DECL_MIO_NAME (ifsrc) +DECL_MIO_NAME (save_state) DECL_MIO_NAME (procedure_type) DECL_MIO_NAME (ref_type) DECL_MIO_NAME (sym_flavor) @@ -1590,6 +1590,7 @@ mio_symbol_attribute (symbol_attribute *attr) attr->intent = MIO_NAME (sym_intent) (attr->intent, intents); attr->proc = MIO_NAME (procedure_type) (attr->proc, procedures); attr->if_source = MIO_NAME (ifsrc) (attr->if_source, ifsrc_types); + attr->save = MIO_NAME (save_state) (attr->save, save_status); if (iomode == IO_OUTPUT) { @@ -1607,8 +1608,6 @@ mio_symbol_attribute (symbol_attribute *attr) MIO_NAME (ab_attribute) (AB_POINTER, attr_bits); if (attr->protected) MIO_NAME (ab_attribute) (AB_PROTECTED, attr_bits); - if (attr->save) - MIO_NAME (ab_attribute) (AB_SAVE, attr_bits); if (attr->value) MIO_NAME (ab_attribute) (AB_VALUE, attr_bits); if (attr->volatile_) @@ -1696,9 +1695,6 @@ mio_symbol_attribute (symbol_attribute *attr) case AB_PROTECTED: attr->protected = 1; break; - case AB_SAVE: - attr->save = 1; - break; case AB_VALUE: attr->value = 1; break; diff --git a/gcc/fortran/symbol.c b/gcc/fortran/symbol.c index 42f7776dff6..5e76fe240f8 100644 --- a/gcc/fortran/symbol.c +++ b/gcc/fortran/symbol.c @@ -79,6 +79,12 @@ const mstring ifsrc_types[] = minit ("USAGE", IFSRC_USAGE) }; +const mstring save_status[] = +{ + minit ("UNKNOWN", SAVE_NONE), + minit ("EXPLICIT-SAVE", SAVE_EXPLICIT), + minit ("IMPLICIT-SAVE", SAVE_IMPLICIT), +}; /* This is to make sure the backend generates setup code in the correct order. */ @@ -393,9 +399,34 @@ check_conflict (symbol_attribute *attr, const char *name, locus *where) } } + if (attr->save == SAVE_EXPLICIT) + { + conf (dummy, save); + conf (in_common, save); + conf (result, save); + + switch (attr->flavor) + { + case FL_PROGRAM: + case FL_BLOCK_DATA: + case FL_MODULE: + case FL_LABEL: + case FL_PROCEDURE: + case FL_DERIVED: + case FL_PARAMETER: + a1 = gfc_code2string (flavors, attr->flavor); + a2 = save; + goto conflict; + + case FL_VARIABLE: + case FL_NAMELIST: + default: + break; + } + } + conf (dummy, entry); conf (dummy, intrinsic); - conf (dummy, save); conf (dummy, threadprivate); conf (pointer, target); conf (pointer, intrinsic); @@ -407,7 +438,7 @@ check_conflict (symbol_attribute *attr, const char *name, locus *where) conf (external, dimension); /* See Fortran 95's R504. */ conf (external, intrinsic); - + if (attr->if_source || attr->contained) { conf (external, subroutine); @@ -423,8 +454,6 @@ check_conflict (symbol_attribute *attr, const char *name, locus *where) conf (in_common, dummy); conf (in_common, allocatable); conf (in_common, result); - conf (in_common, save); - conf (result, save); conf (dummy, result); @@ -536,7 +565,6 @@ check_conflict (symbol_attribute *attr, const char *name, locus *where) case FL_LABEL: conf2 (dimension); conf2 (dummy); - conf2 (save); conf2 (volatile_); conf2 (pointer); conf2 (protected); @@ -558,7 +586,6 @@ check_conflict (symbol_attribute *attr, const char *name, locus *where) case FL_PROCEDURE: conf2 (intent); - conf2 (save); if (attr->subroutine) { @@ -586,7 +613,6 @@ check_conflict (symbol_attribute *attr, const char *name, locus *where) case PROC_DUMMY: conf2 (result); conf2 (in_common); - conf2 (save); conf2 (threadprivate); break; @@ -598,7 +624,6 @@ check_conflict (symbol_attribute *attr, const char *name, locus *where) case FL_DERIVED: conf2 (dummy); - conf2 (save); conf2 (pointer); conf2 (target); conf2 (external); @@ -630,7 +655,6 @@ check_conflict (symbol_attribute *attr, const char *name, locus *where) conf2 (target); conf2 (dummy); conf2 (in_common); - conf2 (save); conf2 (value); conf2 (volatile_); conf2 (threadprivate); @@ -3161,7 +3185,7 @@ gen_special_c_interop_ptr (int ptr_id, const char *ptr_name, /* Set up the symbol's important fields. Save attr required so we can initialize the ptr to NULL. */ - tmp_sym->attr.save = 1; + tmp_sym->attr.save = SAVE_EXPLICIT; tmp_sym->ts.is_c_interop = 1; tmp_sym->attr.is_c_interop = 1; tmp_sym->ts.is_iso_c = 1; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 4d5e6885a5f..d0d604aba57 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2007-07-06 Daniel Franke + + * gfortran.dg/save_parameter.f90: New test. + * gfortran.dg/module_md5_1.f90: Updated MD5 sum. + 2007-07-06 Richard Guenther * g++.dg/opt/pr30965.C: New testcase. diff --git a/gcc/testsuite/gfortran.dg/module_md5_1.f90 b/gcc/testsuite/gfortran.dg/module_md5_1.f90 index 6382df1eb32..8bf9ddb1eb3 100644 --- a/gcc/testsuite/gfortran.dg/module_md5_1.f90 +++ b/gcc/testsuite/gfortran.dg/module_md5_1.f90 @@ -10,5 +10,5 @@ program test use foo print *, pi end program test -! { dg-final { scan-module "foo" "MD5:6d026a84bb779a7b6789854d85d4f01f" } } +! { dg-final { scan-module "foo" "MD5:1a6374d65e99c0175c42016a649f79db" } } ! { dg-final { cleanup-modules "foo" } } diff --git a/gcc/testsuite/gfortran.dg/save_parameter.f90 b/gcc/testsuite/gfortran.dg/save_parameter.f90 new file mode 100644 index 00000000000..dd879bb869d --- /dev/null +++ b/gcc/testsuite/gfortran.dg/save_parameter.f90 @@ -0,0 +1,10 @@ +! { dg-do compile } +! PR fortran/32633 - implied SAVE conflicts with parameter attribute +! Testcase contributed by: Joost VandeVondele + +MODULE test + CHARACTER(len=1), PARAMETER :: backslash = '\\' + PUBLIC :: backslash +END MODULE + +! { dg-final { cleanup-modules "test" } }