Commit 80f4d7c3 authored by Richard Henderson's avatar Richard Henderson
Browse files

tcg: Fix constant folding of INDEX_op_extract2_i32 

On a 64-bit host, discard any replications of the 32-bit
sign bit when performing the shift and merge.

Fixes: https://bugs.launchpad.net/bugs/1834496


Tested-by: default avatarChristophe Lyon <christophe.lyon@linaro.org>
Tested-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Reviewed-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Signed-off-by: default avatarRichard Henderson <richard.henderson@linaro.org>
parent 1316b1dd

tcg/optimize.c

+2 −2
Original line number Diff line number Diff line
@@ -1213,8 +1213,8 @@ void tcg_optimize(TCGContext *s) 
                if (opc == INDEX_op_extract2_i64) {

                    tmp = (v1 >> op->args[3]) | (v2 << (64 - op->args[3]));

                } else {

                    tmp = (v1 >> op->args[3]) | (v2 << (32 - op->args[3]));

                    tmp = (int32_t)tmp;

                    tmp = (int32_t)(((uint32_t)v1 >> op->args[3]) |

                                    ((uint32_t)v2 << (32 - op->args[3])));

                }

                tcg_opt_gen_movi(s, op, op->args[0], tmp);

                break;