diff options
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/expr.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/pr42119.f90 | 24 |
4 files changed, 39 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e9b2e7320ed..0aa39ad92ba 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,12 @@ 2009-11-30 Richard Guenther <rguenther@suse.de> + PR middle-end/42119 + PR fortran/38530 + * expr.c (expand_expr_addr_expr_1): Properly expand the initializer + of CONST_DECLs. + +2009-11-30 Richard Guenther <rguenther@suse.de> + * tree-into-ssa.c (insert_phi_nodes): Add PHI nodes in variable UID order. diff --git a/gcc/expr.c b/gcc/expr.c index 75c17923cd0..13ae5fffc9f 100644 --- a/gcc/expr.c +++ b/gcc/expr.c @@ -6840,9 +6840,8 @@ expand_expr_addr_expr_1 (tree exp, rtx target, enum machine_mode tmode, return expand_expr (TREE_OPERAND (exp, 0), target, tmode, modifier); case CONST_DECL: - /* Recurse and make the output_constant_def clause above handle this. */ - return expand_expr_addr_expr_1 (DECL_INITIAL (exp), target, - tmode, modifier, as); + /* Expand the initializer like constants above. */ + return XEXP (expand_expr_constant (DECL_INITIAL (exp), 0, modifier), 0); case REALPART_EXPR: /* The real part of the complex number is always first, therefore diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f09f148f3f8..6d75d60e37d 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2009-11-30 Richard Guenther <rguenther@suse.de> + + PR middle-end/42119 + PR fortran/38530 + * gfortran.dg/pr42119.f90: New testcase. + 2009-11-30 Dodji Seketeli <dodji@redhat.com> PR c++/42069 diff --git a/gcc/testsuite/gfortran.dg/pr42119.f90 b/gcc/testsuite/gfortran.dg/pr42119.f90 new file mode 100644 index 00000000000..f848e9e9f60 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr42119.f90 @@ -0,0 +1,24 @@ +! { dg-do compile } + +module Test +use ISO_C_BINDING + +contains + +subroutine Callback(arg) bind(C) + integer(C_INT) :: arg +end subroutine Callback + +subroutine Check(proc) + type(C_FUNPTR) :: proc +end subroutine Check + +end module Test + + +program Main + use Test + type(C_FUNPTR) :: proc + + call Check(C_FUNLOC(Callback)) +end program Main |