diff options
| author | burnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-01-05 07:19:30 +0000 |
|---|---|---|
| committer | burnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-01-05 07:19:30 +0000 |
| commit | c1de3106b314776897013d2d4fb8f9443b204d93 (patch) | |
| tree | 2ae149e5997603aff8300a6d2a76abd2638c2a1a | |
| parent | f9321467b698a20b583279d42235857213aa2bbb (diff) | |
| download | ppe42-gcc-c1de3106b314776897013d2d4fb8f9443b204d93.tar.gz ppe42-gcc-c1de3106b314776897013d2d4fb8f9443b204d93.zip | |
2010-01-05 Tobias Burnus <burnus@net-b.de>
PR fortran/41872
* trans-expr.c (gfc_conv_procedure_call): Nullify
return value for allocatable-scalar character functions.
2010-01-05 Tobias Burnus <burnus@net-b.de>
PR fortran/41872
* gfortran.dg/allocatable_scalar_8.f90: New.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@155639 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/trans-expr.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/allocatable_scalar_8.f90 | 17 |
4 files changed, 34 insertions, 0 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 1e6501a31c5..6a594255dfe 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2010-01-05 Tobias Burnus <burnus@net-b.de> + + PR fortran/41872 + * trans-expr.c (gfc_conv_procedure_call): Nullify + return value for allocatable-scalar character functions. + 2010-01-04 Tobias Burnus <burnus@net-b.de> PR fortran/36161 diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index 84eb585f558..e5fce02c6c7 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -3351,6 +3351,12 @@ gfc_conv_procedure_call (gfc_se * se, gfc_symbol * sym, { var = gfc_create_var (type, "pstr"); + if ((!comp && sym->attr.allocatable) + || (comp && comp->attr.allocatable)) + gfc_add_modify (&se->pre, var, + fold_convert (TREE_TYPE (var), + null_pointer_node)); + /* Provide an address expression for the function arguments. */ var = gfc_build_addr_expr (NULL_TREE, var); } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 603f6297735..08622cb1fda 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2010-01-05 Tobias Burnus <burnus@net-b.de> + + PR fortran/41872 + * gfortran.dg/allocatable_scalar_8.f90: New. + 2010-01-04 Martin Jambor <mjambor@suse.cz> PR tree-optimization/42398 diff --git a/gcc/testsuite/gfortran.dg/allocatable_scalar_8.f90 b/gcc/testsuite/gfortran.dg/allocatable_scalar_8.f90 new file mode 100644 index 00000000000..f7940ede575 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/allocatable_scalar_8.f90 @@ -0,0 +1,17 @@ +! { dg-do run } +! +! PR fortran/41872 +! +! Character functions returning allocatable scalars +! +program test + implicit none + if (func () /= 'abc') call abort () +contains + function func() result (str) + character(len=3), allocatable :: str + if (allocated (str)) call abort () + allocate (str) + str = 'abc' + end function func +end program test |
