diff options
| author | Patrick O'Neill <patrick@rivosinc.com> | 2023-11-14 15:08:31 -0800 |
|---|---|---|
| committer | Patrick O'Neill <patrick@rivosinc.com> | 2023-11-15 10:23:44 -0800 |
| commit | 026d9454b1d9971061ad2e7d47c3ef4b0b96495d (patch) | |
| tree | f99e1172eef96bafb782a877873a131cd74d02f1 /gcc | |
| parent | 186331063dfbcf1eacb445c473d92634c9baa90f (diff) | |
| download | gcc-026d9454b1d9971061ad2e7d47c3ef4b0b96495d.zip gcc-026d9454b1d9971061ad2e7d47c3ef4b0b96495d.tar.gz gcc-026d9454b1d9971061ad2e7d47c3ef4b0b96495d.tar.bz2 | |
RISC-V: Fix ICE in non-canonical march parsing
Passing in a base extension in non-canonical order (i, e, g) causes GCC
to ICE:
xgcc: error: '-march=rv64ge': ISA string is not in canonical order. 'e'
xgcc: internal compiler error: in add, at common/config/riscv/riscv-common.cc:671
...
This is fixed by skipping to the next extension when a non-canonical
order is detected.
gcc/ChangeLog:
* common/config/riscv/riscv-common.cc
(riscv_subset_list::parse_std_ext): Emit an error and skip to
the next extension when a non-canonical ordering is detected.
gcc/testsuite/ChangeLog:
* gcc.target/riscv/arch-27.c: New test.
* gcc.target/riscv/arch-28.c: New test.
Signed-off-by: Patrick O'Neill <patrick@rivosinc.com>
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/common/config/riscv/riscv-common.cc | 17 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.target/riscv/arch-27.c | 7 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.target/riscv/arch-28.c | 7 |
3 files changed, 27 insertions, 4 deletions
diff --git a/gcc/common/config/riscv/riscv-common.cc b/gcc/common/config/riscv/riscv-common.cc index 526dbb7..5111626 100644 --- a/gcc/common/config/riscv/riscv-common.cc +++ b/gcc/common/config/riscv/riscv-common.cc @@ -1017,15 +1017,24 @@ riscv_subset_list::parse_std_ext (const char *p) std_ext = *p; /* Checking canonical order. */ + const char *prior_std_exts = std_exts; + while (*std_exts && std_ext != *std_exts) std_exts++; subset[0] = std_ext; if (std_ext != *std_exts && standard_extensions_p (subset)) - error_at (m_loc, - "%<-march=%s%>: ISA string is not in canonical order. " - "%<%c%>", - m_arch, *p); + { + error_at (m_loc, + "%<-march=%s%>: ISA string is not in canonical order. " + "%<%c%>", + m_arch, *p); + /* Extension ordering is invalid. Ignore this extension and keep + searching for other issues with remaining extensions. */ + std_exts = prior_std_exts; + p++; + continue; + } std_exts++; diff --git a/gcc/testsuite/gcc.target/riscv/arch-27.c b/gcc/testsuite/gcc.target/riscv/arch-27.c new file mode 100644 index 0000000..70143b2 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/arch-27.c @@ -0,0 +1,7 @@ +/* { dg-do compile } */ +/* { dg-options "-march=rv64ge -mabi=lp64d" } */ +int foo() +{ +} + +/* { dg-error "ISA string is not in canonical order. 'e'" "" { target *-*-* } 0 } */ diff --git a/gcc/testsuite/gcc.target/riscv/arch-28.c b/gcc/testsuite/gcc.target/riscv/arch-28.c new file mode 100644 index 0000000..934399a --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/arch-28.c @@ -0,0 +1,7 @@ +/* { dg-do compile } */ +/* { dg-options "-march=rv64imaefcv -mabi=lp64d" } */ +int foo() +{ +} + +/* { dg-error "ISA string is not in canonical order. 'e'" "" { target *-*-* } 0 } */ |