From 5cb41805708de9784dd9ce6dfc88c0cd4f87af93 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tobias=20Schl=C3=BCter?= Date: Sun, 28 Oct 2007 19:53:27 +0100 Subject: [PATCH] re PR fortran/32147 (Module file change due to order of writting out changes) fortran/ PR fortran/32147 * module.c (write_symbol): Fix whitespace. (write_symbol0): Walk symtree from left-to-right instead breadth-first. (write_symbol1): Similarly change walk of pointer info tree. (write_module): Insert linebreak. * symbol.c (gfc_traverse_symtree): Change to left-to-right order. (traverse_ns): Likewise. testsuite/ PR fortran/32147 * gfortran.dg/module_md5_1.f90: Update hash-value. From-SVN: r129701 --- gcc/fortran/ChangeLog | 11 +++++ gcc/fortran/module.c | 52 ++++++++++++---------- gcc/fortran/symbol.c | 14 +++--- gcc/testsuite/ChangeLog | 5 +++ gcc/testsuite/gfortran.dg/module_md5_1.f90 | 2 +- 5 files changed, 53 insertions(+), 31 deletions(-) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 2dd0c388e4c..c75af08c8b4 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,14 @@ +2007-10-28 Tobias Schlüter + + PR fortran/32147 + * module.c (write_symbol): Fix whitespace. + (write_symbol0): Walk symtree from left-to-right instead + breadth-first. + (write_symbol1): Similarly change walk of pointer info tree. + (write_module): Insert linebreak. + * symbol.c (gfc_traverse_symtree): Change to left-to-right order. + (traverse_ns): Likewise. + 2007-10-27 Jerry DeLisle PR fortran/31306 diff --git a/gcc/fortran/module.c b/gcc/fortran/module.c index 78bbac83d0a..12c451697df 100644 --- a/gcc/fortran/module.c +++ b/gcc/fortran/module.c @@ -3880,7 +3880,7 @@ write_equiv (void) static void write_symbol (int n, gfc_symbol *sym) { - const char *label; + const char *label; if (sym->attr.flavor == FL_UNKNOWN || sym->attr.flavor == FL_LABEL) gfc_internal_error ("write_symbol(): bad module symbol '%s'", sym->name); @@ -3913,12 +3913,12 @@ write_symbol0 (gfc_symtree *st) { gfc_symbol *sym; pointer_info *p; + bool dont_write = false; if (st == NULL) return; write_symbol0 (st->left); - write_symbol0 (st->right); sym = st->n.sym; if (sym->module == NULL) @@ -3926,20 +3926,25 @@ write_symbol0 (gfc_symtree *st) if (sym->attr.flavor == FL_PROCEDURE && sym->attr.generic && !sym->attr.subroutine && !sym->attr.function) - return; + dont_write = true; if (!gfc_check_access (sym->attr.access, sym->ns->default_access)) - return; + dont_write = true; - p = get_pointer (sym); - if (p->type == P_UNKNOWN) - p->type = P_SYMBOL; + if (!dont_write) + { + p = get_pointer (sym); + if (p->type == P_UNKNOWN) + p->type = P_SYMBOL; - if (p->u.wsym.state == WRITTEN) - return; + if (p->u.wsym.state != WRITTEN) + { + write_symbol (p->integer, sym); + p->u.wsym.state = WRITTEN; + } + } - write_symbol (p->integer, sym); - p->u.wsym.state = WRITTEN; + write_symbol0 (st->right); } @@ -3953,22 +3958,22 @@ write_symbol0 (gfc_symtree *st) static int write_symbol1 (pointer_info *p) { + int result; - if (p == NULL) + if (!p) return 0; - if (write_symbol1 (p->left)) - return 1; - if (write_symbol1 (p->right)) - return 1; + result = write_symbol1 (p->left); - if (p->type != P_SYMBOL || p->u.wsym.state != NEEDS_WRITE) - return 0; - - p->u.wsym.state = WRITTEN; - write_symbol (p->integer, p->u.wsym.sym); + if (!(p->type != P_SYMBOL || p->u.wsym.state != NEEDS_WRITE)) + { + p->u.wsym.state = WRITTEN; + write_symbol (p->integer, p->u.wsym.sym); + result = 1; + } - return 1; + result |= write_symbol1 (p->right); + return result; } @@ -4103,7 +4108,8 @@ write_module (void) mio_lparen (); write_symbol0 (gfc_current_ns->sym_root); - while (write_symbol1 (pi_root)); + while (write_symbol1 (pi_root)) + /* Nothing. */; mio_rparen (); diff --git a/gcc/fortran/symbol.c b/gcc/fortran/symbol.c index b0c2825a76d..8ef2b1d22a2 100644 --- a/gcc/fortran/symbol.c +++ b/gcc/fortran/symbol.c @@ -2927,13 +2927,12 @@ clear_sym_mark (gfc_symtree *st) void gfc_traverse_symtree (gfc_symtree *st, void (*func) (gfc_symtree *)) { - if (st != NULL) - { - (*func) (st); + if (!st) + return; - gfc_traverse_symtree (st->left, func); - gfc_traverse_symtree (st->right, func); - } + gfc_traverse_symtree (st->left, func); + (*func) (st); + gfc_traverse_symtree (st->right, func); } @@ -2946,11 +2945,12 @@ traverse_ns (gfc_symtree *st, void (*func) (gfc_symbol *)) if (st == NULL) return; + traverse_ns (st->left, func); + if (st->n.sym->mark == 0) (*func) (st->n.sym); st->n.sym->mark = 1; - traverse_ns (st->left, func); traverse_ns (st->right, func); } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f2996bd2f9d..66168c796ba 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2007-10-28 Tobias Schlüter + + PR fortran/32147 + * gfortran.dg/module_md5_1.f90: Update hash-value. + 2007-10-28 Andrew Pinski PR tree-opt/33589 diff --git a/gcc/testsuite/gfortran.dg/module_md5_1.f90 b/gcc/testsuite/gfortran.dg/module_md5_1.f90 index 3c4efb0950f..b9bb5fa1eb6 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:22d65c2e261759ab63cb7db9d0a8882b" } } +! { dg-final { scan-module "foo" "MD5:2350094d1d87eb25ab22af5f8e96e011" } } ! { dg-final { cleanup-modules "foo" } } -- 2.30.2