diff options
| author | Daniel Franke <franke.daniel@gmail.com> | 2007-08-01 08:52:48 -0400 |
|---|---|---|
| committer | Daniel Franke <dfranke@gcc.gnu.org> | 2007-08-01 08:52:48 -0400 |
| commit | d05360a6128c8ba1e2c616bc94d23a5c686b92db (patch) | |
| tree | 179f02146059e9ae5f92b9364d6e2eff3d13d366 | |
| parent | e5c95afe1e18581b060601f70b1a6888835028ce (diff) | |
| download | gcc-d05360a6128c8ba1e2c616bc94d23a5c686b92db.zip gcc-d05360a6128c8ba1e2c616bc94d23a5c686b92db.tar.gz gcc-d05360a6128c8ba1e2c616bc94d23a5c686b92db.tar.bz2 | |
re PR fortran/32945 (ICE with initialization expressions)
gcc/fortran:
2007-08-01 Daniel Franke <franke.daniel@gmail.com>
PR fortran/32945
* expr.c (check_specification_function): Skip check if no symtree
is available.
gcc/testsuite:
2007-08-01 Daniel Franke <franke.daniel@gmail.com>
PR fortran/32945
* gfortran.dg/initialization_12.f90: New test.
From-SVN: r127124
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/expr.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/initialization_12.f90 | 29 |
4 files changed, 44 insertions, 0 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 4acddfd..81ba111 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2007-08-01 Daniel Franke <franke.daniel@gmail.com> + + PR fortran/32945 + * expr.c (check_specification_function): Skip check if no symtree + is available. + 2007-08-01 Paul Thomas <pault@gcc.gnu.org> PR fortran/31609 diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index 8e608ed..1048920 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -693,6 +693,10 @@ static match check_specification_function (gfc_expr *e) { gfc_symbol *sym; + + if (!e->symtree) + return MATCH_NO; + sym = e->symtree->n.sym; /* F95, 7.1.6.2; F2003, 7.1.7 */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 2ef4a14..81e9296 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2007-08-01 Daniel Franke <franke.daniel@gmail.com> + + PR fortran/32945 + * gfortran.dg/initialization_12.f90: New test. + 2007-08-01 Paul Thomas <pault@gcc.gnu.org> PR fortran/31609 diff --git a/gcc/testsuite/gfortran.dg/initialization_12.f90 b/gcc/testsuite/gfortran.dg/initialization_12.f90 new file mode 100644 index 0000000..deef207 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/initialization_12.f90 @@ -0,0 +1,29 @@ +! { dg-do compile } +! PR fortran/32945 - ICE in init expressions +! +! Contributed by Florian Ladstaedter <flad AT gmx DOT at> +! + +MODULE EGOPS_Utilities +CONTAINS + FUNCTION dirname(fullfilename) + Character(LEN=*), Intent(In) :: fullfilename + Character(LEN=LEN(fullfilename)) :: dirname + dirname = '' + END FUNCTION +END MODULE EGOPS_Utilities + +MODULE AtmoIono + CHARACTER(LEN=10), PARAMETER :: ComputeDryAtmModel = 'Dry Atm. ' + + type AtmModel + character (len=len(ComputeDryAtmModel)) :: moistDryStr + end type AtmModel +END MODULE AtmoIono + +module AtmoIonoSphere + use EGOPS_Utilities + use AtmoIono +end module AtmoIonoSphere + +! { dg-final { cleanup-modules "EGOPS_Utilities AtmoIono AtmoIonoSphere" } } |