diff options
| author | Janus Weil <janus@gcc.gnu.org> | 2009-10-23 18:10:08 +0200 |
|---|---|---|
| committer | Janus Weil <janus@gcc.gnu.org> | 2009-10-23 18:10:08 +0200 |
| commit | 566df91a821dd06954011f491f2b7f0a2f253bef (patch) | |
| tree | 0171b9eff9cb09069b473e5f2c988f3115b39aae /gcc | |
| parent | 428b80d5e40f1217e82ed45c3e060549c8f3298b (diff) | |
| download | gcc-566df91a821dd06954011f491f2b7f0a2f253bef.zip gcc-566df91a821dd06954011f491f2b7f0a2f253bef.tar.gz gcc-566df91a821dd06954011f491f2b7f0a2f253bef.tar.bz2 | |
re PR fortran/41800 ([OOP] ICE in fold_convert_loc, at fold-const.c:2789)
2009-10-23 Janus Weil <janus@gcc.gnu.org>
PR fortran/41800
* trans-expr.c (gfc_trans_scalar_assign): Handle CLASS variables.
2009-10-23 Janus Weil <janus@gcc.gnu.org>
PR fortran/41800
* gfortran.dg/class_10.f03: New test.
From-SVN: r153504
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fortran/trans-expr.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/class_10.f03 | 32 |
4 files changed, 43 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 0668a68..bc4ecb0 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,10 @@ 2009-10-23 Janus Weil <janus@gcc.gnu.org> + PR fortran/41800 + * trans-expr.c (gfc_trans_scalar_assign): Handle CLASS variables. + +2009-10-23 Janus Weil <janus@gcc.gnu.org> + PR fortran/41758 * match.c (conformable_arrays): Move to resolve.c. (gfc_match_allocate): Don't resolve SOURCE expr yet, and move some diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index dc58dbf..da442ed 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -4660,7 +4660,7 @@ gfc_trans_scalar_assign (gfc_se * lse, gfc_se * rse, gfc_typespec ts, gfc_add_expr_to_block (&block, tmp); } } - else if (ts.type == BT_DERIVED) + else if (ts.type == BT_DERIVED || ts.type == BT_CLASS) { gfc_add_block_to_block (&block, &lse->pre); gfc_add_block_to_block (&block, &rse->pre); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 03d2165..0fdbc54 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2009-10-23 Janus Weil <janus@gcc.gnu.org> + + PR fortran/41800 + * gfortran.dg/class_10.f03: New test. + 2009-10-22 Michael Meissner <meissner@linux.vnet.ibm.com> PR target/41787 diff --git a/gcc/testsuite/gfortran.dg/class_10.f03 b/gcc/testsuite/gfortran.dg/class_10.f03 new file mode 100644 index 0000000..f238a59 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/class_10.f03 @@ -0,0 +1,32 @@ +! { dg-do compile } +! +! PR 41800: [OOP] ICE in fold_convert_loc, at fold-const.c:2789 +! +! Contributed by Harald Anlauf <anlauf@gmx.de> + +module abstract_gradient + + implicit none + private + + type, public, abstract :: gradient_class + contains + procedure, nopass :: inner_product + end type + +contains + + function inner_product () + class(gradient_class), pointer :: inner_product + inner_product => NULL() + end function + +end module + + + use abstract_gradient + class(gradient_class), pointer :: g_initial, ip_save + ip_save => g_initial%inner_product() ! ICE +end + +! { dg-final { cleanup-modules "abstract_gradient" } } |