diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2011-09-27 21:17:31 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2011-09-27 21:17:31 +0200 |
| commit | 82aa87223192a954c5bee4fc5d7dadae0d120b7e (patch) | |
| tree | 8fe351ceea5fb4aa1c1e79248400f0b0802c3b84 /gcc | |
| parent | 4c345757e00b62047a02d4f1349f31104aa07bd8 (diff) | |
| download | gcc-82aa87223192a954c5bee4fc5d7dadae0d120b7e.zip gcc-82aa87223192a954c5bee4fc5d7dadae0d120b7e.tar.gz gcc-82aa87223192a954c5bee4fc5d7dadae0d120b7e.tar.bz2 | |
trans-types.c (gfc_type_for_size): Return wider type if no suitable narrower type has been found.
* trans-types.c (gfc_type_for_size): Return wider type
if no suitable narrower type has been found.
(gfc_type_for_mode): Return NULL_TREE if gfc_type_for_size
returned type doesn't have expected TYPE_MODE.
From-SVN: r179290
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/fortran/trans-types.c | 26 |
2 files changed, 27 insertions, 6 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 5900b63..99d2d3c 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2011-09-27 Jakub Jelinek <jakub@redhat.com> + + * trans-types.c (gfc_type_for_size): Return wider type + if no suitable narrower type has been found. + (gfc_type_for_mode): Return NULL_TREE if gfc_type_for_size + returned type doesn't have expected TYPE_MODE. + 2011-09-26 Janus Weil <janus@gcc.gnu.org> PR fortran/50515 diff --git a/gcc/fortran/trans-types.c b/gcc/fortran/trans-types.c index 43f1a19..aa8e43b 100644 --- a/gcc/fortran/trans-types.c +++ b/gcc/fortran/trans-types.c @@ -2791,18 +2791,29 @@ gfc_type_for_size (unsigned bits, int unsignedp) if (bits == TYPE_PRECISION (intTI_type_node)) return intTI_type_node; #endif + + if (bits <= TYPE_PRECISION (intQI_type_node)) + return intQI_type_node; + if (bits <= TYPE_PRECISION (intHI_type_node)) + return intHI_type_node; + if (bits <= TYPE_PRECISION (intSI_type_node)) + return intSI_type_node; + if (bits <= TYPE_PRECISION (intDI_type_node)) + return intDI_type_node; + if (bits <= TYPE_PRECISION (intTI_type_node)) + return intTI_type_node; } else { - if (bits == TYPE_PRECISION (unsigned_intQI_type_node)) + if (bits <= TYPE_PRECISION (unsigned_intQI_type_node)) return unsigned_intQI_type_node; - if (bits == TYPE_PRECISION (unsigned_intHI_type_node)) + if (bits <= TYPE_PRECISION (unsigned_intHI_type_node)) return unsigned_intHI_type_node; - if (bits == TYPE_PRECISION (unsigned_intSI_type_node)) + if (bits <= TYPE_PRECISION (unsigned_intSI_type_node)) return unsigned_intSI_type_node; - if (bits == TYPE_PRECISION (unsigned_intDI_type_node)) + if (bits <= TYPE_PRECISION (unsigned_intDI_type_node)) return unsigned_intDI_type_node; - if (bits == TYPE_PRECISION (unsigned_intTI_type_node)) + if (bits <= TYPE_PRECISION (unsigned_intTI_type_node)) return unsigned_intTI_type_node; } @@ -2823,7 +2834,10 @@ gfc_type_for_mode (enum machine_mode mode, int unsignedp) else if (GET_MODE_CLASS (mode) == MODE_COMPLEX_FLOAT) base = gfc_complex_types; else if (SCALAR_INT_MODE_P (mode)) - return gfc_type_for_size (GET_MODE_PRECISION (mode), unsignedp); + { + tree type = gfc_type_for_size (GET_MODE_PRECISION (mode), unsignedp); + return type != NULL_TREE && mode == TYPE_MODE (type) ? type : NULL_TREE; + } else if (VECTOR_MODE_P (mode)) { enum machine_mode inner_mode = GET_MODE_INNER (mode); |