diff options
| author | Jeff Law <jlaw@ventanamicro.com> | 2024-06-23 08:26:25 -0600 |
|---|---|---|
| committer | Jeff Law <jlaw@ventanamicro.com> | 2024-06-23 08:27:48 -0600 |
| commit | fd536b8412d4dae42aa04739c06f99a915be6261 (patch) | |
| tree | 0ecf91219b7ebdc37f500a7422867b4f2a81c2d0 /gcc | |
| parent | 2a345214fc332b6f0821edf394ff8802b768db1d (diff) | |
| download | gcc-fd536b8412d4dae42aa04739c06f99a915be6261.zip gcc-fd536b8412d4dae42aa04739c06f99a915be6261.tar.gz gcc-fd536b8412d4dae42aa04739c06f99a915be6261.tar.bz2 | |
[committed][RISC-V][PR target/114139] Verify we have a CONST_INT before extracting INTVAL
Run-of-the-mill checking issue. We had something like (plus (reg) (reg)) and
tried to extract INTVAL (XEXP (x, 1)) which of course blows up with checking
on.
Fixed thusly. Tested on riscv32-elf in my tester. riscv64-elf is in flight,
but won't finish for a while due to other tasks in flight.
PR target/114139
gcc/
* config/riscv/riscv.cc (riscv_macro_fusion_pair_p): Verify object
is a CONST_INT before looking at INTVAL.
gcc/testsuite/
* gcc.target/riscv/pr114139.c: New test.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/config/riscv/riscv.cc | 1 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.target/riscv/pr114139.c | 27 |
2 files changed, 28 insertions, 0 deletions
diff --git a/gcc/config/riscv/riscv.cc b/gcc/config/riscv/riscv.cc index c17141d..5c758b9 100644 --- a/gcc/config/riscv/riscv.cc +++ b/gcc/config/riscv/riscv.cc @@ -9242,6 +9242,7 @@ riscv_macro_fusion_pair_p (rtx_insn *prev, rtx_insn *curr) && XINT (SET_SRC (prev_set), 1) == UNSPEC_AUIPC && (GET_CODE (SET_SRC (curr_set)) == LO_SUM || (GET_CODE (SET_SRC (curr_set)) == PLUS + && CONST_INT_P (XEXP (SET_SRC (curr_set), 1)) && SMALL_OPERAND (INTVAL (XEXP (SET_SRC (curr_set), 1)))))) return true; diff --git a/gcc/testsuite/gcc.target/riscv/pr114139.c b/gcc/testsuite/gcc.target/riscv/pr114139.c new file mode 100644 index 0000000..1d4eeb6 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/pr114139.c @@ -0,0 +1,27 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -fpic -mexplicit-relocs -mcpu=sifive-p450" } */ + +static void *p; +extern void *a[]; +void +baz (void) +{ + p = 0; +} + +void bar (void); +void +foo (int i) +{ + bar (); + a[i] = p; +} + + +double *d; +void +foobar (int i) +{ + for (; i; ++i) + d[i] = 1; +} |