diff options
| author | burnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-09-20 21:49:12 +0000 |
|---|---|---|
| committer | burnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-09-20 21:49:12 +0000 |
| commit | c9c81ef3c667aaa14c498a5449ec6d134b4b66ff (patch) | |
| tree | 0ac440db6513ee01deb5e5dc6142769d1e5b7b2d /gcc/explow.c | |
| parent | 12cdcb9d74f55c165366ca1b1eeec013a0ce72ef (diff) | |
| parent | 891196d7325e4c55d92d5ac5cfe7161c4f36c0ce (diff) | |
| download | gcc-fortran-dev.tar.gz | |
Merge from trunk (r239915 to r240230)fortran-dev
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/fortran-dev@240290 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/explow.c')
| -rw-r--r-- | gcc/explow.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/gcc/explow.c b/gcc/explow.c index b14291d8653..e935c307bcb 100644 --- a/gcc/explow.c +++ b/gcc/explow.c @@ -106,7 +106,15 @@ plus_constant (machine_mode mode, rtx x, HOST_WIDE_INT c, if (GET_CODE (XEXP (x, 0)) == SYMBOL_REF && CONSTANT_POOL_ADDRESS_P (XEXP (x, 0))) { - tem = plus_constant (mode, get_pool_constant (XEXP (x, 0)), c); + rtx cst = get_pool_constant (XEXP (x, 0)); + + if (GET_CODE (cst) == CONST_VECTOR + && GET_MODE_INNER (GET_MODE (cst)) == mode) + { + cst = gen_lowpart (mode, cst); + gcc_assert (cst); + } + tem = plus_constant (mode, cst, c); tem = force_const_mem (GET_MODE (x), tem); /* Targets may disallow some constants in the constant pool, thus force_const_mem may return NULL_RTX. */ |