+2008-01-06 Jerry DeLisle <jvdelisle@gcc.gnu.org>
+
+ PR fortran/34387
+ * trans-expr.c (gfc_conv_missing_dummy): Use a temporary to type convert
+ the dummy variable expression, test for NULL, and pass the variable
+ address to the called function.
+
2007-01-06 Tobias Burnus <burnus@net-b.de>
PR fortran/34658
present = gfc_conv_expr_present (arg->symtree->n.sym);
- tmp = build3 (COND_EXPR, TREE_TYPE (se->expr), present, se->expr,
- fold_convert (TREE_TYPE (se->expr), integer_zero_node));
- tmp = gfc_evaluate_now (tmp, &se->pre);
-
if (kind > 0)
{
+ /* Create a temporary and convert it to the correct type. */
tmp = gfc_get_int_type (kind);
- tmp = fold_convert (tmp, se->expr);
- tmp = gfc_evaluate_now (tmp, &se->pre);
+ tmp = fold_convert (tmp, build_fold_indirect_ref (se->expr));
+
+ /* Test for a NULL value. */
+ tmp = build3 (COND_EXPR, TREE_TYPE (tmp), present, tmp, integer_one_node);
+ tmp = gfc_evaluate_now (tmp, &se->pre);
+ se->expr = build_fold_addr_expr (tmp);
+ }
+ else
+ {
+ tmp = build3 (COND_EXPR, TREE_TYPE (se->expr), present, se->expr,
+ fold_convert (TREE_TYPE (se->expr), integer_zero_node));
+ tmp = gfc_evaluate_now (tmp, &se->pre);
+ se->expr = tmp;
}
-
- se->expr = tmp;
if (ts.type == BT_CHARACTER)
{