diff options
| author | hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-09-10 14:44:20 +0000 |
|---|---|---|
| committer | hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-09-10 14:44:20 +0000 |
| commit | 3689689967532fcba08488a67351be75f6e8faee (patch) | |
| tree | 05617c079ccaa413d47387ff2560d6ff0312a40c /gcc | |
| parent | 5eff8174eaf4360ecdaae13f89dafb7ce58c88ff (diff) | |
| download | gcc-3689689967532fcba08488a67351be75f6e8faee.tar.gz | |
Check that result of string folding is of integral type.
gcc/
2010-09-10 H.J. Lu <hongjiu.lu@intel.com>
PR middle-end/45634
* tree-ssa-ccp.c (fold_const_aggregate_ref): Check that result
of string folding is of integral type.
gcc/testsuite/
2010-09-10 H.J. Lu <hongjiu.lu@intel.com>
PR middle-end/45634
* gfortran.fortran-torture/compile/pr45634.f90: New.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@164183 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.fortran-torture/compile/pr45634.f90 | 5 | ||||
| -rw-r--r-- | gcc/tree-ssa-ccp.c | 5 |
4 files changed, 19 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5f62d06447b..bda4cdab0c5 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2010-09-10 H.J. Lu <hongjiu.lu@intel.com> + + PR middle-end/45634 + * tree-ssa-ccp.c (fold_const_aggregate_ref): Check that result + of string folding is of integral type. + 2010-09-10 Ryan Mansfield <rmansfield@qnx.com> * doc/invoke.texi (-x): Fix typo. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 7f4f87b1271..9815d188de2 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2010-09-10 H.J. Lu <hongjiu.lu@intel.com> + + PR middle-end/45634 + * gfortran.fortran-torture/compile/pr45634.f90: New. + 2010-09-10 Nicola Pero <nicola.pero@meta-innovation.com> * objc.dg/fobjc-exceptions.m: New test. diff --git a/gcc/testsuite/gfortran.fortran-torture/compile/pr45634.f90 b/gcc/testsuite/gfortran.fortran-torture/compile/pr45634.f90 new file mode 100644 index 00000000000..ab0c33ad32d --- /dev/null +++ b/gcc/testsuite/gfortran.fortran-torture/compile/pr45634.f90 @@ -0,0 +1,5 @@ + SUBROUTINE RCRDRD (VTYP) + CHARACTER(4), INTENT(OUT) :: VTYP + CHARACTER(1), SAVE :: DBL = "D" + VTYP = DBL + END diff --git a/gcc/tree-ssa-ccp.c b/gcc/tree-ssa-ccp.c index 60e2b55b71c..33d5cc75fea 100644 --- a/gcc/tree-ssa-ccp.c +++ b/gcc/tree-ssa-ccp.c @@ -1537,8 +1537,9 @@ fold_const_aggregate_ref (tree t) /* Fold read from constant string. */ if (TREE_CODE (ctor) == STRING_CST) { - if ((TYPE_MODE (TREE_TYPE (t)) - == TYPE_MODE (TREE_TYPE (TREE_TYPE (ctor)))) + if (INTEGRAL_TYPE_P (TREE_TYPE (t)) + && (TYPE_MODE (TREE_TYPE (t)) + == TYPE_MODE (TREE_TYPE (TREE_TYPE (ctor)))) && (GET_MODE_CLASS (TYPE_MODE (TREE_TYPE (TREE_TYPE (ctor)))) == MODE_INT) && GET_MODE_SIZE (TYPE_MODE (TREE_TYPE (TREE_TYPE (ctor)))) == 1 |