From: "H.J. Lu" <hjl.tools@gmail.com>
To: Michael Matz <matz@suse.de>
Cc: Richard Guenther <richard.guenther@gmail.com>, gcc-patches@gcc.gnu.org
Subject: Re: PATCH [5/n]: Prepare x32: PR middle-end/48016: Inconsistency in non-local goto save area
Date: Thu, 30 Jun 2011 18:10:00 -0000 [thread overview]
Message-ID: <BANLkTikR74CQL_j=sDLn1FZz+N6PNFqgdw@mail.gmail.com> (raw)
In-Reply-To: <Pine.LNX.4.64.1106291810500.17115@wotan.suse.de>
[-- Attachment #1: Type: text/plain, Size: 1508 bytes --]
On Wed, Jun 29, 2011 at 9:16 AM, Michael Matz <matz@suse.de> wrote:
> Hi,
>
> On Wed, 29 Jun 2011, H.J. Lu wrote:
>
>> > diff --git a/gcc/function.c b/gcc/function.c
>> > index 81c4d39..131bc09 100644
>> > --- a/gcc/function.c
>> > +++ b/gcc/function.c
>> > @@ -4780,7 +4780,7 @@ expand_function_start (tree subr)
>> > cfun->nonlocal_goto_save_area,
>> > integer_zero_node, NULL_TREE, NULL_TREE);
>> > r_save = expand_expr (t_save, NULL_RTX, VOIDmode, EXPAND_WRITE);
>> > - r_save = convert_memory_address (Pmode, r_save);
>> > + r_save = adjust_address (r_save, Pmode, 0);
>
> This is actually the same problem as in explow.c. t_save is built with
> ptr_type_node, where it should have been using
> TREE_TYPE (TREE_TYPE (cfun->nonlocal_goto_save_area))
>
> Then r_save should have the correct mode already, possibly this could be
> asserted. You are right that r_save needs to correspond to the
> nonlocal_goto_save_area[0] array-ref, hence pseudos aren't okay, therefore
> convert_memory_address isn't. Actually I think we might even want to
> assert that indeed the expanded r_save is of Pmode already.
>
>
This patch works for me. OK for trunk if there are no regressions?
Thanks.
--
H.J.
---
2011-06-30 H.J. Lu <hongjiu.lu@intel.com>
PR middle-end/48016
* explow.c (update_nonlocal_goto_save_area): Use proper mode
for stack save area.
* function.c (expand_function_start): Likewise.
[-- Attachment #2: gcc-x32-pr48016-3.patch --]
[-- Type: text/plain, Size: 1648 bytes --]
2011-06-30 H.J. Lu <hongjiu.lu@intel.com>
PR middle-end/48016
* explow.c (update_nonlocal_goto_save_area): Use proper mode
for stack save area.
* function.c (expand_function_start): Likewise.
diff --git a/gcc/explow.c b/gcc/explow.c
index c7d8183..efe6c7e 100644
--- a/gcc/explow.c
+++ b/gcc/explow.c
@@ -1102,7 +1097,9 @@ update_nonlocal_goto_save_area (void)
first one is used for the frame pointer save; the rest are sized by
STACK_SAVEAREA_MODE. Create a reference to array index 1, the first
of the stack save area slots. */
- t_save = build4 (ARRAY_REF, ptr_type_node, cfun->nonlocal_goto_save_area,
+ t_save = build4 (ARRAY_REF,
+ TREE_TYPE (TREE_TYPE (cfun->nonlocal_goto_save_area)),
+ cfun->nonlocal_goto_save_area,
integer_one_node, NULL_TREE, NULL_TREE);
r_save = expand_expr (t_save, NULL_RTX, VOIDmode, EXPAND_WRITE);
diff --git a/gcc/function.c b/gcc/function.c
index 5be018a..0b2f5aa 100644
--- a/gcc/function.c
+++ b/gcc/function.c
@@ -4782,11 +4782,12 @@ expand_function_start (tree subr)
if (!DECL_RTL_SET_P (var))
expand_decl (var);
- t_save = build4 (ARRAY_REF, ptr_type_node,
+ t_save = build4 (ARRAY_REF,
+ TREE_TYPE (TREE_TYPE (cfun->nonlocal_goto_save_area)),
cfun->nonlocal_goto_save_area,
integer_zero_node, NULL_TREE, NULL_TREE);
r_save = expand_expr (t_save, NULL_RTX, VOIDmode, EXPAND_WRITE);
- r_save = convert_memory_address (Pmode, r_save);
+ gcc_assert (GET_MODE (r_save) == Pmode);
emit_move_insn (r_save, targetm.builtin_setjmp_frame_value ());
update_nonlocal_goto_save_area ();
next prev parent reply other threads:[~2011-06-30 18:05 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-11 16:22 H.J. Lu
2011-06-15 14:37 ` Michael Matz
2011-06-15 15:10 ` H.J. Lu
[not found] ` <Pine.LNX.4.64.1106151659200.17115@wotan.suse.de>
2011-06-16 6:41 ` H.J. Lu
2011-06-16 8:02 ` Richard Guenther
2011-06-16 17:59 ` H.J. Lu
2011-06-25 16:20 ` H.J. Lu
2011-06-29 15:25 ` H.J. Lu
2011-06-29 17:03 ` Michael Matz
2011-06-30 18:10 ` H.J. Lu [this message]
2011-07-01 8:01 ` Richard Guenther
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='BANLkTikR74CQL_j=sDLn1FZz+N6PNFqgdw@mail.gmail.com' \
--to=hjl.tools@gmail.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=matz@suse.de \
--cc=richard.guenther@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).