diff options
| author | Janus Weil <janus@gcc.gnu.org> | 2013-12-18 23:00:53 +0100 |
|---|---|---|
| committer | Janus Weil <janus@gcc.gnu.org> | 2013-12-18 23:00:53 +0100 |
| commit | 7289d1c97783c40ead8e74d6137e2dddc0d59e30 (patch) | |
| tree | 192e21ebbdbdd80b1285dd235fa974713a3cb89a /gcc/fortran/trans-expr.c | |
| parent | f00f3b679e86ce80311dbeaa514ff488634f9245 (diff) | |
| download | gcc-7289d1c97783c40ead8e74d6137e2dddc0d59e30.zip gcc-7289d1c97783c40ead8e74d6137e2dddc0d59e30.tar.gz gcc-7289d1c97783c40ead8e74d6137e2dddc0d59e30.tar.bz2 | |
re PR fortran/59493 ([OOP] ICE: Segfault on Class(*) pointer association)
2013-12-18 Janus Weil <janus@gcc.gnu.org>
PR fortran/59493
* gfortran.h (gfc_find_intrinsic_vtab): Removed prototype.
(gfc_find_vtab): New prototype.
* class.c (gfc_find_intrinsic_vtab): Rename to 'find_intrinsic_vtab' and
make static. Minor modifications.
(gfc_find_vtab): New function.
(gfc_class_initializer): Use new function 'gfc_find_vtab'.
* check.c (gfc_check_move_alloc): Ditto.
* expr.c (gfc_check_pointer_assign): Ditto.
* interface.c (compare_actual_formal): Ditto.
* resolve.c (resolve_allocate_expr, resolve_select_type): Ditto.
* trans-expr.c (gfc_conv_intrinsic_to_class, gfc_trans_class_assign):
Ditto.
* trans-intrinsic.c (conv_intrinsic_move_alloc): Ditto.
* trans-stmt.c (gfc_trans_allocate): Ditto.
From-SVN: r206101
Diffstat (limited to 'gcc/fortran/trans-expr.c')
| -rw-r--r-- | gcc/fortran/trans-expr.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index 62ba932..d6498ae 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -558,7 +558,7 @@ gfc_conv_intrinsic_to_class (gfc_se *parmse, gfc_expr *e, /* Set the vptr. */ ctree = gfc_class_vptr_get (var); - vtab = gfc_find_intrinsic_vtab (&e->ts); + vtab = gfc_find_vtab (&e->ts); gcc_assert (vtab); tmp = gfc_build_addr_expr (NULL_TREE, gfc_get_symbol_decl (vtab)); gfc_add_modify (&parmse->pre, ctree, @@ -1015,12 +1015,10 @@ gfc_trans_class_assign (gfc_expr *expr1, gfc_expr *expr2, gfc_exec_op op) goto assign_vptr; } - if (expr2->ts.type == BT_DERIVED) - vtab = gfc_find_derived_vtab (expr2->ts.u.derived); - else if (expr2->expr_type == EXPR_NULL) - vtab = gfc_find_derived_vtab (expr1->ts.u.derived); + if (expr2->expr_type == EXPR_NULL) + vtab = gfc_find_vtab (&expr1->ts); else - vtab = gfc_find_intrinsic_vtab (&expr2->ts); + vtab = gfc_find_vtab (&expr2->ts); gcc_assert (vtab); rhs = gfc_get_expr (); |