diff options
| author | Richard Guenther <rguenther@suse.de> | 2008-09-04 19:32:02 +0000 |
|---|---|---|
| committer | Richard Biener <rguenth@gcc.gnu.org> | 2008-09-04 19:32:02 +0000 |
| commit | 6e1b67b3645308d0543d925baa7aad3e14306c77 (patch) | |
| tree | 27a5bcd6078a1369a3103494899ef3c7d2310ab8 /gcc/fortran/trans-expr.c | |
| parent | a524985e06f2b5bda5bea91b716ad2ad3bcc351a (diff) | |
| download | gcc-6e1b67b3645308d0543d925baa7aad3e14306c77.zip gcc-6e1b67b3645308d0543d925baa7aad3e14306c77.tar.gz gcc-6e1b67b3645308d0543d925baa7aad3e14306c77.tar.bz2 | |
trans-array.c (gfc_conv_array_parameter): Use correct types in building COND_EXPRs.
2008-09-04 Richard Guenther <rguenther@suse.de>
* trans-array.c (gfc_conv_array_parameter): Use correct types
in building COND_EXPRs.
* trans-expr.c (gfc_conv_missing_dummy): Likewise.
* trans-intrinsics.c (gfc_conv_intrinsic_merge): Likewise.
* gfortran.dg/internal_pack_4.f90: Adjust pattern.
From-SVN: r140001
Diffstat (limited to 'gcc/fortran/trans-expr.c')
| -rw-r--r-- | gcc/fortran/trans-expr.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index 8ebda49..d253976 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -161,7 +161,8 @@ gfc_conv_missing_dummy (gfc_se * se, gfc_expr * arg, gfc_typespec ts, int kind) 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 = build3 (COND_EXPR, TREE_TYPE (tmp), present, tmp, + fold_convert (TREE_TYPE (tmp), integer_one_node)); tmp = gfc_evaluate_now (tmp, &se->pre); se->expr = build_fold_addr_expr (tmp); } |