From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 84312 invoked by alias); 10 Feb 2020 16:22:53 -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 84260 invoked by uid 89); 10 Feb 2020 16:22:53 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-11.6 required=5.0 tests=AWL,BAYES_00,FREEMAIL_FROM,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,SPF_PASS autolearn=ham version=3.3.1 spammy=H*RU:209.85.208.194, sk:ix86_fu, HX-Spam-Relays-External:209.85.208.194, HContent-Transfer-Encoding:8bit X-HELO: mail-lj1-f194.google.com Received: from mail-lj1-f194.google.com (HELO mail-lj1-f194.google.com) (209.85.208.194) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 10 Feb 2020 16:22:52 +0000 Received: by mail-lj1-f194.google.com with SMTP id y6so7890073lji.0 for ; Mon, 10 Feb 2020 08:22:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Um9uc0yGZmW0GeprV9J95DPJ42DTNahtWiGwe+XM6Pw=; b=mvtA/f76BGCFXKYM0tTtKSEnQdaQu3bt8ypHfUuz5muXsH+vdcqP1GEv1VZFz0wJri YWBLxm2l2NP3qz+no0MlZVFnPHlIpaDRwQD1Mw7+N5hCiRSuL1I2hhwRSzvoGTXWgimD K2SUzqMlS6P6L0eu0iRYC9VlHCSumVWzr6BAo7MSv/qM5WYudHCNXcB+puGXYTrb04i8 z/u1rZblDfmQ/60/uXJcKxcitzPdqZXoqnARMyJf/4k2Cw70IFZVFGy4ssJaXMWrKqfP oHeM3vClmE1mXtt8yL4Yb3DFX3nrWtNV/IztX23aBmnURGot8/F6I6MxwWUWiykTUDBX PDvw== Return-Path: Received: from localhost.localdomain ([185.68.146.210]) by smtp.gmail.com with ESMTPSA id t9sm374645lfl.51.2020.02.10.08.22.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2020 08:22:48 -0800 (PST) From: Paul Gofman To: gcc-patches@gcc.gnu.org Cc: Paul Gofman Subject: [PATCH] Fix stack pointer handling in ms_hook_prologue functions for i386 target. Date: Mon, 10 Feb 2020 16:22:00 -0000 Message-Id: <20200210162241.988175-1-gofmanp@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-IsSubscribed: yes X-SW-Source: 2020-02/txt/msg00554.txt.bz2 ChangeLog: 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. testsuite/ChangeLog: PR target/91489 * gcc.target/i386/ms_hook_prologue.c: Expand testcase to reproduce PR target/91489 issue. Signed-off-by: Paul Gofman --- gcc/config/i386/i386-protos.h | 1 + gcc/config/i386/i386.c | 3 +++ gcc/config/i386/i386.md | 5 ++++- gcc/testsuite/gcc.target/i386/ms_hook_prologue.c | 13 ++++++++++++- 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/gcc/config/i386/i386-protos.h b/gcc/config/i386/i386-protos.h index 266381ca5a6..966ce426a18 100644 --- a/gcc/config/i386/i386-protos.h +++ b/gcc/config/i386/i386-protos.h @@ -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); diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index 44bc0e0176a..68e2a7519f4 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -4954,6 +4954,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; diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md index f14683cd14f..a7302b886c6 100644 --- a/gcc/config/i386/i386.md +++ b/gcc/config/i386/i386.md @@ -13445,10 +13445,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) { diff --git a/gcc/testsuite/gcc.target/i386/ms_hook_prologue.c b/gcc/testsuite/gcc.target/i386/ms_hook_prologue.c index e11bcc049cb..12e54c0e4ad 100644 --- a/gcc/testsuite/gcc.target/i386/ms_hook_prologue.c +++ b/gcc/testsuite/gcc.target/i386/ms_hook_prologue.c @@ -4,6 +4,8 @@ /* { dg-require-effective-target ms_hook_prologue } */ /* { dg-options "-O2 -fomit-frame-pointer" } */ +#include + 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(); } -- 2.24.1