diff options
| author | Daniel Franke <dfranke@gcc.gnu.org> | 2007-12-22 17:18:28 -0500 |
|---|---|---|
| committer | Daniel Franke <dfranke@gcc.gnu.org> | 2007-12-22 17:18:28 -0500 |
| commit | 111716e0e166cbcec6880ec3266bbc335f96d2ca (patch) | |
| tree | ccbe60c206a371af87a720afe69089d642dff136 | |
| parent | 62ee27a4694a9dcd8a9470217dd03900ef7c8ba3 (diff) | |
| download | gcc-111716e0e166cbcec6880ec3266bbc335f96d2ca.zip gcc-111716e0e166cbcec6880ec3266bbc335f96d2ca.tar.gz gcc-111716e0e166cbcec6880ec3266bbc335f96d2ca.tar.bz2 | |
re PR fortran/34559 (ICE using REPEAT on string literals)
gcc/fortran:
2007-12-22 Daniel Franke <franke.daniel@gmail.com>
PR fortran/34559
* simplify.c (gfc_simplify_repeat): Added safeguard for empty string
literals.
gcc/testsuite:
2007-12-22 Daniel Franke <franke.daniel@gmail.com>
PR fortran/34559
* gfortran.dg/repeat_6.f90: New test.
From-SVN: r131139
| -rw-r--r-- | gcc/fortran/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/fortran/simplify.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/repeat_6.f90 | 13 |
4 files changed, 28 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index a5bf542..79c23de 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2007-12-22 Daniel Franke <franke.daniel@gmail.com> + + PR fortran/34559 + * simplify.c (gfc_simplify_repeat): Added safeguard for empty + string literals. + 2007-12-22 Thomas Koenig <tkoenig@gcc.gnu.org> PR fortran/34549 @@ -26,6 +32,7 @@ * module.c (read_module): Check sym->module is there before using it in a string comparison. +>>>>>>> .r131138 2007-12-20 Tobias Burnus <burnus@net-b.de> PR fortran/34482 diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c index be0b18f..1641586 100644 --- a/gcc/fortran/simplify.c +++ b/gcc/fortran/simplify.c @@ -3128,7 +3128,9 @@ gfc_simplify_repeat (gfc_expr *e, gfc_expr *n) if (e->expr_type != EXPR_CONSTANT) return NULL; - if (len || mpz_sgn (e->ts.cl->length->value.integer) != 0) + if (len || + (e->ts.cl->length && + mpz_sgn (e->ts.cl->length->value.integer)) != 0) { const char *res = gfc_extract_int (n, &ncop); gcc_assert (res == NULL); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f079ae6..a6816d4 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2007-12-22 Daniel Franke <franke.daniel@gmail.com> + + PR fortran/34559 + * gfortran.dg/repeat_6.f90: New test. + 2007-12-22 Thomas Koenig <tkoenig@gcc.gnu.org> PR fortran/34549 diff --git a/gcc/testsuite/gfortran.dg/repeat_6.f90 b/gcc/testsuite/gfortran.dg/repeat_6.f90 new file mode 100644 index 0000000..308941f --- /dev/null +++ b/gcc/testsuite/gfortran.dg/repeat_6.f90 @@ -0,0 +1,13 @@ +! { dg-do run } +! +! PR34559 -- ICE on empty string literals +! +! Contributed by Tobias Burnus <burnus@gcc.gnu.org> +! + + character(len=200) :: string = "a" // repeat ("", 3) & + // repeat ("xxx", 0) & + // repeat ("string", 2) + + if (string /= "astringstring") CALL abort() +end |