procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix stack pointer handling in ms_hook_prologue functions for i386 target.

Browse source 
gcc/
	PR target/91489
	* config/i386/i386.md (simple_return): Also check
	for ms_hook_prologue function attribute.
	* config/i386/i386.c (ix86_can_use_return_insn_p):
	Also check for ms_hook_prologue function attribute.
	* config/i386/i386-protos.h (ix86_function_ms_hook_prologue): Declare.

gcc/testsuite
	PR target/91489
	* gcc.target/i386/ms_hook_prologue.c: Expand testcase
	to reproduce PR target/91489 issue.
This commit is contained in:
Jeff Law 2020-11-06 17:38:00 -05:00
parent e5502ae72f
commit 659ba632e4
4 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gcc/config/i386/i386-protos.h
View file

@ -26,6 +26,7 @@ extern bool ix86_handle_option (struct gcc_options *opts,
/* Functions in i386.c */
extern bool ix86_target_stack_probe (void);
extern bool ix86_can_use_return_insn_p (void);
extern bool ix86_function_ms_hook_prologue (const_tree fn);
extern void ix86_setup_frame_addresses (void);
extern bool ix86_rip_relative_addr_p (struct ix86_address *parts);

3
gcc/config/i386/i386.c
View file

@ -5494,6 +5494,9 @@ symbolic_reference_mentioned_p (rtx op)
bool
ix86_can_use_return_insn_p (void)
{
if (ix86_function_ms_hook_prologue (current_function_decl))
return false;
if (ix86_function_naked (current_function_decl))
return false;

5
gcc/config/i386/i386.md
View file

@ -13662,10 +13662,13 @@
;; static chain pointer - the first instruction has to be pushl %esi
;; and it can't be moved around, as we use alternate entry points
;; in that case.
;; Also disallow for ms_hook_prologue functions which have frame
;; pointer set up in function label which is correctly handled in
;; ix86_expand_{prologue|epligoue}() only.
(define_expand "simple_return"
[(simple_return)]
"!TARGET_SEH && !ix86_static_chain_on_stack"
"!TARGET_SEH && !ix86_static_chain_on_stack && !ix86_function_ms_hook_prologue (cfun->decl)"
{
if (crtl->args.pops_args)
{

13
gcc/testsuite/gcc.target/i386/ms_hook_prologue.c
View file

@ -4,6 +4,8 @@
/* { dg-require-effective-target ms_hook_prologue } */
/* { dg-options "-O2 -fomit-frame-pointer" } */
#include <stdio.h>
int __attribute__ ((__ms_hook_prologue__)) foo ()
{
unsigned char *ptr = (unsigned char *) foo;
@ -32,7 +34,16 @@ int __attribute__ ((__ms_hook_prologue__)) foo ()
return 0;
}
unsigned int __attribute__ ((noinline, __ms_hook_prologue__)) test_func()
{
static int value;
if (value++) puts("");
return 0;
}
int main ()
{
return foo();
return foo() || test_func();
}