From patchwork Mon Aug 20 18:19:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 959879 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-484000-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="CSAKeouH"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41vMX272hGz9s3x for ; Tue, 21 Aug 2018 04:19:13 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:reply-to:mime-version :content-type; q=dns; s=default; b=FF0yGsGt0GwJv05M1o2FN+rGcnoDO 25YW62X52Ss9lIy0+h+fUZTXr1vpIIOfxpFKpRwHRqi5xHpl9dJYx8s0yrJ667FL We1bI7RzNpf912ybwur2LFwpcgzfgOX+ezBy1EcDz/nT/GA99Yc/nyjDtqtbPmu3 LMtL3U7a6k7jgY= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:reply-to:mime-version :content-type; s=default; bh=+cCPAlSV0LtgEjgbSjGicQA1hWM=; b=CSA KeouHbfLf8dChB6ItTgoImRFmlte5ylz0wXXMlDWe5/zB75pxlqGJewZVIPySS80 2EORSFb5b7R2AFqL96xnY9+Mq47jmThBFY71sv9lvqMUV8OffDdHprr6mx6yI9ck Qd3fWwoFGMZ8rfWi2hQAvRi5UhUKOzYsytaTPX7k= Received: (qmail 104065 invoked by alias); 20 Aug 2018 18:19:06 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 104025 invoked by uid 89); 20 Aug 2018 18:19:03 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, NO_DNS_FOR_FROM autolearn=ham version=3.3.2 spammy=wish X-HELO: mga07.intel.com Received: from mga07.intel.com (HELO mga07.intel.com) (134.134.136.100) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 20 Aug 2018 18:19:02 +0000 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Aug 2018 11:19:01 -0700 Received: from gnu-cfl-1.sc.intel.com ([172.25.70.237]) by FMSMGA003.fm.intel.com with ESMTP; 20 Aug 2018 11:19:00 -0700 Received: by gnu-cfl-1.sc.intel.com (Postfix, from userid 1000) id DFB43440DD3; Mon, 20 Aug 2018 11:19:00 -0700 (PDT) Date: Mon, 20 Aug 2018 11:19:00 -0700 From: "H.J. Lu" To: gcc-patches@gcc.gnu.org Cc: Uros Bizjak Subject: [PATCH] x86: Always update EH return address in word_mode Message-ID: <20180820181900.GA27620@intel.com> Reply-To: "H.J. Lu" MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) On x86, return address is always popped in word_mode. eh_return needs to put EH return address in word_mode on stack. Tested on x86-64 with x32. OK for trunk and release branches? Thanks. H.J. --- gcc/ PR target/87014 * config/i386/i386.md (eh_return): Always update EH return address in word_mode. gcc/testsuite/ PR target/87014 * g++.dg/pr87014.C: New file. --- gcc/config/i386/i386.md | 5 ++++- gcc/testsuite/g++.dg/pr87014.C | 38 ++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/pr87014.C diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md index 918241d953a..71faa218ffa 100644 --- a/gcc/config/i386/i386.md +++ b/gcc/config/i386/i386.md @@ -13612,7 +13612,10 @@ stack address we wish to restore. */ tmp = gen_rtx_PLUS (Pmode, arg_pointer_rtx, sa); tmp = plus_constant (Pmode, tmp, -UNITS_PER_WORD); - tmp = gen_rtx_MEM (Pmode, tmp); + /* Return address is always in word_mode. */ + tmp = gen_rtx_MEM (word_mode, tmp); + if (GET_MODE (ra) != word_mode) + ra = convert_to_mode (word_mode, ra, 1); emit_move_insn (tmp, ra); emit_jump_insn (gen_eh_return_internal ()); diff --git a/gcc/testsuite/g++.dg/pr87014.C b/gcc/testsuite/g++.dg/pr87014.C new file mode 100644 index 00000000000..060ec948c90 --- /dev/null +++ b/gcc/testsuite/g++.dg/pr87014.C @@ -0,0 +1,38 @@ +// { dg-do run } +// { dg-options "-O0" } + +void +fillstack () +{ + long long foo[] = + { + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + }; +} + +void +f (long long=-1,long long=-1,long long=-1,long long=-1, + long long=-1,long long=-1,long long arg7_on_stack=-1) +{ + throw 0; +} + +void +g() +{ + try + { + f (); + } + catch (int) + { + } +} + +int +main() +{ + fillstack (); + g (); + return 0; +}