diff options
| author | Francois-Xavier Coudert <fxcoudert@gcc.gnu.org> | 2008-02-15 21:12:24 +0000 |
|---|---|---|
| committer | François-Xavier Coudert <fxcoudert@gcc.gnu.org> | 2008-02-15 21:12:24 +0000 |
| commit | 750606c6b235a3d7e1d5fcdfbc5f3f1f68efcefe (patch) | |
| tree | 717a9d3b9a9d4cada4a008ed5787a7293589e166 | |
| parent | ac84c0623d12bb99990f34f6bfdf0b17ab976ad6 (diff) | |
| download | gcc-750606c6b235a3d7e1d5fcdfbc5f3f1f68efcefe.zip gcc-750606c6b235a3d7e1d5fcdfbc5f3f1f68efcefe.tar.gz gcc-750606c6b235a3d7e1d5fcdfbc5f3f1f68efcefe.tar.bz2 | |
trans-expr.c (gfc_conv_function_call): Force evaluation of se->expr.
* trans-expr.c (gfc_conv_function_call): Force evaluation of
se->expr.
* gfortran.dg/c_loc_tests_12.f03: New test.
From-SVN: r132353
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/trans-expr.c | 7 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/c_loc_tests_12.f03 | 32 |
4 files changed, 50 insertions, 0 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 1aa75d6..ad34b66 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2008-02-15 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org> + + PR fortran/35150 + * trans-expr.c (gfc_conv_function_call): Force evaluation of + se->expr. + 2008-02-10 Daniel Franke <franke.daniel@gmail.com> fortran/PR35019 diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index 89bc3c2..4866d8c 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -2264,6 +2264,13 @@ gfc_conv_function_call (gfc_se * se, gfc_symbol * sym, gfc_conv_array_parameter (se, arg->expr, argss, f); } + /* TODO -- the following two lines shouldn't be necessary, but + they're removed a bug is exposed later in the codepath. + This is workaround was thus introduced, but will have to be + removed; please see PR 35150 for details about the issue. */ + se->expr = convert (pvoid_type_node, se->expr); + se->expr = gfc_evaluate_now (se->expr, &se->pre); + return 0; } else if (sym->intmod_sym_id == ISOCBINDING_FUNLOC) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 6665d26..fb695f0 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-02-15 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org> + + PR fortran/35150 + * gfortran.dg/c_loc_tests_12.f03: New test. + 2008-02-15 Douglas Gregor <doug.gregor@gmail.com> PR c++/35023 diff --git a/gcc/testsuite/gfortran.dg/c_loc_tests_12.f03 b/gcc/testsuite/gfortran.dg/c_loc_tests_12.f03 new file mode 100644 index 0000000..252c1c5 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/c_loc_tests_12.f03 @@ -0,0 +1,32 @@ +! { dg-do compile } +! +! Test for PR 35150, reduced testcases by Tobias Burnus +! +module test1 + use, intrinsic :: iso_c_binding + implicit none +contains + subroutine sub1(argv) bind(c,name="sub1") + type(c_ptr), intent(in) :: argv + end subroutine + + subroutine sub2 + type(c_ptr), dimension(1), target :: argv = c_null_ptr + character(c_char), dimension(1), target :: s = c_null_char + call sub1(c_loc(argv)) + end subroutine +end module test1 + +program test2 + use iso_c_binding + type(c_ptr), target, save :: argv + interface + subroutine sub1(argv) bind(c) + import + type(c_ptr) :: argv + end subroutine sub1 + end interface + call sub1(c_loc(argv)) +end program test2 +! +! { dg-final { cleanup-modules "test1" } } |