From 241dbd9d6844dc7f9c463674bd1221984eec539e Mon Sep 17 00:00:00 2001 From: Qing Zhao Date: Wed, 11 Oct 2017 19:43:54 +0000 Subject: [PATCH] re PR target/81422 ([aarch64] internal compiler error: in update_equiv_regs, at ira.c:3425) /gcc 2017-10-11 Qing Zhao PR target/81422 * config/aarch64/aarch64.c (aarch64_load_symref_appropriately): Check whether the dest is REG before adding REG_EQUIV note. /gcc/testsuite 2017-10-11 Qing Zhao PR target/81422 * gcc.target/aarch64/pr81422.C: New test. From-SVN: r253657 --- gcc/ChangeLog | 6 ++++++ gcc/config/aarch64/aarch64.c | 12 ++++++++---- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.target/aarch64/pr81422.C | 15 +++++++++++++++ 4 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 gcc/testsuite/gcc.target/aarch64/pr81422.C diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c3d95d9ba5b..deda4e554ac 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2017-10-11 Qing Zhao + + PR target/81422 + * config/aarch64/aarch64.c (aarch64_load_symref_appropriately): + Check whether the dest is REG before adding REG_EQUIV note. + 2017-10-11 Vladimir Makarov PR sanitizer/82353 diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c index 6b3a7566bc1..ec055876a74 100644 --- a/gcc/config/aarch64/aarch64.c +++ b/gcc/config/aarch64/aarch64.c @@ -1490,7 +1490,8 @@ aarch64_load_symref_appropriately (rtx dest, rtx imm, tp = gen_lowpart (mode, tp); emit_insn (gen_rtx_SET (dest, gen_rtx_PLUS (mode, tp, x0))); - set_unique_reg_note (get_last_insn (), REG_EQUIV, imm); + if (REG_P (dest)) + set_unique_reg_note (get_last_insn (), REG_EQUIV, imm); return; } @@ -1524,7 +1525,8 @@ aarch64_load_symref_appropriately (rtx dest, rtx imm, } emit_insn (gen_rtx_SET (dest, gen_rtx_PLUS (mode, tp, tmp_reg))); - set_unique_reg_note (get_last_insn (), REG_EQUIV, imm); + if (REG_P (dest)) + set_unique_reg_note (get_last_insn (), REG_EQUIV, imm); return; } @@ -1565,7 +1567,8 @@ aarch64_load_symref_appropriately (rtx dest, rtx imm, gcc_unreachable (); } - set_unique_reg_note (get_last_insn (), REG_EQUIV, imm); + if (REG_P (dest)) + set_unique_reg_note (get_last_insn (), REG_EQUIV, imm); return; } @@ -1594,7 +1597,8 @@ aarch64_load_symref_appropriately (rtx dest, rtx imm, emit_insn (gen_tlsie_tiny_sidi (dest, imm, tp)); } - set_unique_reg_note (get_last_insn (), REG_EQUIV, imm); + if (REG_P (dest)) + set_unique_reg_note (get_last_insn (), REG_EQUIV, imm); return; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 740454058d3..71647a87b7a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-10-11 Qing Zhao + + PR target/81422 + * gcc.target/aarch64/pr81422.C: New test. + 2017-10-11 Vladimir Makarov PR sanitizer/82353 diff --git a/gcc/testsuite/gcc.target/aarch64/pr81422.C b/gcc/testsuite/gcc.target/aarch64/pr81422.C new file mode 100644 index 00000000000..5bcc948996e --- /dev/null +++ b/gcc/testsuite/gcc.target/aarch64/pr81422.C @@ -0,0 +1,15 @@ +/* { dg-do compile } */ +/* { dg-options "-O0" } */ + +struct DArray +{ + __SIZE_TYPE__ length; + int* ptr; +}; + +void foo35(DArray) +{ + static __thread int x[5]; + foo35({5, (int*)&x}); +} + -- 2.30.2