From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 23046 invoked by alias); 16 Dec 2015 23:29:56 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 23029 invoked by uid 89); 16 Dec 2015 23:29:55 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.5 required=5.0 tests=AWL,BAYES_00,KAM_LAZY_DOMAIN_SECURITY,NO_DNS_FOR_FROM,T_RP_MATCHES_RCVD autolearn=no version=3.3.2 spammy=H*R:D*gmail.com X-HELO: mga09.intel.com Received: from mga09.intel.com (HELO mga09.intel.com) (134.134.136.24) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 16 Dec 2015 23:29:54 +0000 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP; 16 Dec 2015 15:29:51 -0800 X-ExtLoop1: 1 Received: from gnu-6.sc.intel.com ([172.25.70.52]) by fmsmga001.fm.intel.com with ESMTP; 16 Dec 2015 15:29:51 -0800 Received: by gnu-6.sc.intel.com (Postfix, from userid 1000) id 1292E200116; Wed, 16 Dec 2015 15:29:51 -0800 (PST) Date: Wed, 16 Dec 2015 23:29:00 -0000 From: "H.J. Lu" To: gcc-patches@gcc.gnu.org Cc: Uros Bizjak Subject: [PATCH] PR target/68937: i686: -fno-plt produces wrong code (maybe only with tailcall Message-ID: <20151216232951.GA17976@intel.com> Reply-To: "H.J. Lu" MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.24 (2015-08-30) X-SW-Source: 2015-12/txt/msg01679.txt.bz2 Since sibcall never returns, we can only use call-clobbered register as GOT base. Otherwise, callee-saved register used as GOT base won't be properly restored. Tested on x86-64 with -m32. OK for trunk? H.J. --- gcc/ PR target/68937 * config/i386/i386.c (ix86_function_ok_for_sibcall): Count call via GOT slot as indirect call. (ix86_expand_call): Mark PIC register used for sibcall as call-clobbered. * config/i386/i386.md (*sibcall_GOT_32): New pattern. (*sibcall_value_GOT_32): Likewise. gcc/testsuite/ PR target/68937 * gcc.target/i386/pr68937-1.c: New test. * gcc.target/i386/pr68937-2.c: Likewise. * gcc.target/i386/pr68937-3.c: Likewise. * gcc.target/i386/pr68937-4.c: Likewise. --- gcc/config/i386/i386.c | 15 ++++++++--- gcc/config/i386/i386.md | 45 +++++++++++++++++++++++++++++++ gcc/testsuite/gcc.target/i386/pr68937-1.c | 13 +++++++++ gcc/testsuite/gcc.target/i386/pr68937-2.c | 13 +++++++++ gcc/testsuite/gcc.target/i386/pr68937-3.c | 13 +++++++++ gcc/testsuite/gcc.target/i386/pr68937-4.c | 13 +++++++++ 6 files changed, 109 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gcc.target/i386/pr68937-1.c create mode 100644 gcc/testsuite/gcc.target/i386/pr68937-2.c create mode 100644 gcc/testsuite/gcc.target/i386/pr68937-3.c create mode 100644 gcc/testsuite/gcc.target/i386/pr68937-4.c diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index cecea24..ebc9d09 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -6723,8 +6723,10 @@ ix86_function_ok_for_sibcall (tree decl, tree exp) /* If this call is indirect, we'll need to be able to use a call-clobbered register for the address of the target function. Make sure that all such registers are not used for passing - parameters. Note that DLLIMPORT functions are indirect. */ + parameters. Note that DLLIMPORT functions and call via GOT + slot are indirect. */ if (!decl + || (flag_pic && !flag_plt) || (TARGET_DLLIMPORT_DECL_ATTRIBUTES && DECL_DLLIMPORT_P (decl))) { /* Check if regparm >= 3 since arg_reg_available is set to @@ -27019,8 +27021,8 @@ ix86_expand_call (rtx retval, rtx fnaddr, rtx callarg1, rtx callarg2, rtx pop, bool sibcall) { - rtx vec[3]; - rtx use = NULL, call; + rtx vec[4]; + rtx use = NULL, call, clobber = NULL; unsigned int vec_len = 0; if (pop == const0_rtx) @@ -27075,6 +27077,10 @@ ix86_expand_call (rtx retval, rtx fnaddr, rtx callarg1, fnaddr = gen_rtx_UNSPEC (Pmode, gen_rtvec (1, addr), UNSPEC_GOT); fnaddr = gen_rtx_CONST (Pmode, fnaddr); + /* Since sibcall never returns, mark PIC register as + call-clobbered. */ + if (sibcall) + clobber = pic_offset_table_rtx; fnaddr = gen_rtx_PLUS (Pmode, pic_offset_table_rtx, fnaddr); } @@ -27151,6 +27157,9 @@ ix86_expand_call (rtx retval, rtx fnaddr, rtx callarg1, } vec[vec_len++] = call; + if (clobber) + vec[vec_len++] = gen_rtx_CLOBBER (VOIDmode, clobber); + if (pop) { pop = gen_rtx_PLUS (Pmode, stack_pointer_rtx, pop); diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md index 49b2216..65c1534 100644 --- a/gcc/config/i386/i386.md +++ b/gcc/config/i386/i386.md @@ -11865,6 +11865,28 @@ "* return ix86_output_call_insn (insn, operands[0]);" [(set_attr "type" "call")]) +;; Since sibcall never returns, we can only use call-clobbered register +;; as GOT base. +(define_insn "*sibcall_GOT_32" + [(call (mem:QI + (mem:SI (plus:SI + (match_operand:SI 0 "register_operand" "U") + (const:SI + (unspec:SI [(match_operand:SI 1 "symbol_operand")] + UNSPEC_GOT))))) + (match_operand 2)) + (clobber (match_dup 0))] + "!TARGET_MACHO && !TARGET_64BIT && SIBLING_CALL_P (insn)" +{ + rtx fnaddr = gen_rtx_UNSPEC (Pmode, gen_rtvec (1, operands[1]), + UNSPEC_GOT); + fnaddr = gen_rtx_CONST (Pmode, fnaddr); + fnaddr = gen_rtx_PLUS (Pmode, operands[0], fnaddr); + fnaddr = gen_const_mem (Pmode, fnaddr); + return ix86_output_call_insn (insn, fnaddr); +} + [(set_attr "type" "call")]) + (define_insn "*sibcall" [(call (mem:QI (match_operand:W 0 "sibcall_insn_operand" "UBsBz")) (match_operand 1))] @@ -12042,6 +12064,29 @@ "* return ix86_output_call_insn (insn, operands[1]);" [(set_attr "type" "callv")]) +;; Since sibcall never returns, we can only use call-clobbered register +;; as GOT base. +(define_insn "*sibcall_value_GOT_32" + [(set (match_operand 0) + (call (mem:QI + (mem:SI (plus:SI + (match_operand:SI 1 "register_operand" "U") + (const:SI + (unspec:SI [(match_operand:SI 2 "symbol_operand")] + UNSPEC_GOT))))) + (match_operand 3))) + (clobber (match_dup 1))] + "!TARGET_MACHO && !TARGET_64BIT && SIBLING_CALL_P (insn)" +{ + rtx fnaddr = gen_rtx_UNSPEC (Pmode, gen_rtvec (1, operands[2]), + UNSPEC_GOT); + fnaddr = gen_rtx_CONST (Pmode, fnaddr); + fnaddr = gen_rtx_PLUS (Pmode, operands[1], fnaddr); + fnaddr = gen_const_mem (Pmode, fnaddr); + return ix86_output_call_insn (insn, fnaddr); +} + [(set_attr "type" "callv")]) + (define_insn "*sibcall_value" [(set (match_operand 0) (call (mem:QI (match_operand:W 1 "sibcall_insn_operand" "UBsBz")) diff --git a/gcc/testsuite/gcc.target/i386/pr68937-1.c b/gcc/testsuite/gcc.target/i386/pr68937-1.c new file mode 100644 index 0000000..166c309 --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr68937-1.c @@ -0,0 +1,13 @@ +/* { dg-do compile { target { *-*-linux* && ia32 } } } */ +/* { dg-options "-O2 -fpic -fno-plt -mregparm=3" } */ + +extern void bar (int); + +void +foo (int b) +{ + bar (b); + bar (b); +} + +/* { dg-final { scan-assembler "jmp\[ \t\]*.bar@GOT\\(%e(a|c|d)x\\)" { target ia32 } } } */ diff --git a/gcc/testsuite/gcc.target/i386/pr68937-2.c b/gcc/testsuite/gcc.target/i386/pr68937-2.c new file mode 100644 index 0000000..9aa4f4d --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr68937-2.c @@ -0,0 +1,13 @@ +/* { dg-do compile { target { *-*-linux* && ia32 } } } */ +/* { dg-options "-O2 -fpic -fno-plt -mregparm=3" } */ + +extern void bar (int, int); + +void +foo (int a, int b) +{ + bar (a, b); + bar (a, b); +} + +/* { dg-final { scan-assembler "jmp\[ \t\]*.bar@GOT\\(%e(a|c|d)x\\)" { target ia32 } } } */ diff --git a/gcc/testsuite/gcc.target/i386/pr68937-3.c b/gcc/testsuite/gcc.target/i386/pr68937-3.c new file mode 100644 index 0000000..6d8e40f --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr68937-3.c @@ -0,0 +1,13 @@ +/* { dg-do compile { target { *-*-linux* && ia32 } } } */ +/* { dg-options "-O2 -fpic -fno-plt -mregparm=3" } */ + +extern void bar (int, int, int); + +void +foo (int a, int b, int c) +{ + bar (a, b, c); + bar (a, b, c); +} + +/* { dg-final { scan-assembler-not "jmp\[ \t\]*.bar@GOT" } } */ diff --git a/gcc/testsuite/gcc.target/i386/pr68937-4.c b/gcc/testsuite/gcc.target/i386/pr68937-4.c new file mode 100644 index 0000000..fc5f2a6 --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr68937-4.c @@ -0,0 +1,13 @@ +/* { dg-do compile { target { *-*-linux* && ia32 } } } */ +/* { dg-options "-O2 -fpic -fno-plt -mregparm=3" } */ + +extern int bar (int, int); + +int +foo (int a, int b) +{ + (void) bar (a, b); + return bar (a, b); +} + +/* { dg-final { scan-assembler "jmp\[ \t\]*.bar@GOT\\(%e(a|c|d)x\\)" { target ia32 } } } */ -- 2.5.0