From 02ed904927f5b2ef1538ff44b504183f4cfe9ff0 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Fri, 31 May 2019 23:59:16 +0000 Subject: [PATCH] i386: Don't insert ENDBR after NOTE_INSN_DELETED_LABEL NOTE_INSN_DELETED_LABEL is used to mark what used to be a 'code_label', but was not used for other purposes than taking its address which cannot be used as target for indirect jumps. Tested on Linux/x86-64 with -fcf-protection. For x86-64 libc.so on glibc master branch (commit f43b8dd55588c3), Before: 2961 endbr64 After: 2943 endbr64 gcc/ PR target/89355 * config/i386/i386-features.c (rest_of_insert_endbranch): Remove NOTE_INSN_DELETED_LABEL check. gcc/testsuite/ PR target/89355 * gcc.target/i386/cet-label-3.c: New test. * gcc.target/i386/cet-label-4.c: Likewise. * gcc.target/i386/cet-label-5.c: Likewise. Co-Authored-By: Hongtao Liu From-SVN: r271828 --- gcc/ChangeLog | 7 +++++++ gcc/config/i386/i386-features.c | 5 +---- gcc/testsuite/ChangeLog | 7 +++++++ gcc/testsuite/gcc.target/i386/cet-label-3.c | 23 +++++++++++++++++++++ gcc/testsuite/gcc.target/i386/cet-label-4.c | 12 +++++++++++ gcc/testsuite/gcc.target/i386/cet-label-5.c | 13 ++++++++++++ 6 files changed, 63 insertions(+), 4 deletions(-) create mode 100644 gcc/testsuite/gcc.target/i386/cet-label-3.c create mode 100644 gcc/testsuite/gcc.target/i386/cet-label-4.c create mode 100644 gcc/testsuite/gcc.target/i386/cet-label-5.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e0a6acefdf0..a1e8127e9e9 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2019-05-31 H.J. Lu + Hongtao Liu + + PR target/89355 + * config/i386/i386-features.c (rest_of_insert_endbranch): Remove + NOTE_INSN_DELETED_LABEL check. + 2019-05-31 Prachi Godbole Robert Suchanek diff --git a/gcc/config/i386/i386-features.c b/gcc/config/i386/i386-features.c index 60a120f4df7..c8de5261240 100644 --- a/gcc/config/i386/i386-features.c +++ b/gcc/config/i386/i386-features.c @@ -1911,10 +1911,7 @@ rest_of_insert_endbranch (void) continue; } - if ((LABEL_P (insn) && LABEL_PRESERVE_P (insn)) - || (NOTE_P (insn) - && NOTE_KIND (insn) == NOTE_INSN_DELETED_LABEL)) - /* TODO. Check /s bit also. */ + if (LABEL_P (insn) && LABEL_PRESERVE_P (insn)) { cet_eb = gen_nop_endbr (); emit_insn_after (cet_eb, insn); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index e39b064a41a..04fb8bc5560 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2019-05-31 H.J. Lu + + PR target/89355 + * gcc.target/i386/cet-label-3.c: New test. + * gcc.target/i386/cet-label-4.c: Likewise. + * gcc.target/i386/cet-label-5.c: Likewise. + 2019-05-31 Dragan Mladjenovic * gcc.target/mips/msa-fmadd.c: New. diff --git a/gcc/testsuite/gcc.target/i386/cet-label-3.c b/gcc/testsuite/gcc.target/i386/cet-label-3.c new file mode 100644 index 00000000000..9f427a866f3 --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/cet-label-3.c @@ -0,0 +1,23 @@ +/* PR target/89355 */ +/* { dg-do compile } */ +/* { dg-options "-O2 -fcf-protection" } */ +/* { dg-final { scan-assembler-times "endbr32" 1 { target ia32 } } } */ +/* { dg-final { scan-assembler-times "endbr64" 1 { target { ! ia32 } } } } */ +int +test (int* val) +{ + int status = 99; + + if (!val) + { + status = 22; + goto end; + } + + extern int x; + *val = x; + + status = 0; +end: + return status; +} diff --git a/gcc/testsuite/gcc.target/i386/cet-label-4.c b/gcc/testsuite/gcc.target/i386/cet-label-4.c new file mode 100644 index 00000000000..d743d2bf202 --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/cet-label-4.c @@ -0,0 +1,12 @@ +/* PR target/89355 */ +/* { dg-do compile { target { fpic && lp64 } } } */ +/* { dg-options "-O2 -fcf-protection -fPIC -mcmodel=large" } */ +/* { dg-final { scan-assembler-times "endbr64" 1 } } */ + +extern int val; + +int +test (void) +{ + return val; +} diff --git a/gcc/testsuite/gcc.target/i386/cet-label-5.c b/gcc/testsuite/gcc.target/i386/cet-label-5.c new file mode 100644 index 00000000000..862c79b058d --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/cet-label-5.c @@ -0,0 +1,13 @@ +/* PR target/89355 */ +/* { dg-do compile } */ +/* { dg-options "-O2 -fcf-protection -Wno-return-local-addr" } */ +/* { dg-final { scan-assembler-times "endbr32" 1 { target ia32 } } } */ +/* { dg-final { scan-assembler-times "endbr64" 1 { target { ! ia32 } } } } */ + +void * +func (void) +{ + return &&bar; +bar: + return 0; +} -- 2.30.2