From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 22583 invoked by alias); 14 Jun 2011 15:12:06 -0000 Received: (qmail 22575 invoked by uid 22791); 14 Jun 2011 15:12:04 -0000 X-SWARE-Spam-Status: No, hits=-2.4 required=5.0 tests=AWL,BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,RFC_ABUSE_POST X-Spam-Check-By: sourceware.org Received: from mail-ww0-f51.google.com (HELO mail-ww0-f51.google.com) (74.125.82.51) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 14 Jun 2011 15:11:50 +0000 Received: by wwf26 with SMTP id 26so5381687wwf.8 for ; Tue, 14 Jun 2011 08:11:48 -0700 (PDT) MIME-Version: 1.0 Received: by 10.227.197.83 with SMTP id ej19mr6404370wbb.105.1308064307719; Tue, 14 Jun 2011 08:11:47 -0700 (PDT) Received: by 10.227.28.69 with HTTP; Tue, 14 Jun 2011 08:11:47 -0700 (PDT) In-Reply-To: References: <20110611150953.GA18253@intel.com> Date: Tue, 14 Jun 2011 15:22:00 -0000 Message-ID: Subject: Re: PATCH [1/n]: Prepare x32: PR middle-end/47364: internal compiler error: in emit_move_insn, at expr.c:3355 From: Richard Guenther To: "H.J. Lu" Cc: gcc-patches@gcc.gnu.org Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-IsSubscribed: yes 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 X-SW-Source: 2011-06/txt/msg01061.txt.bz2 On Sun, Jun 12, 2011 at 6:28 PM, H.J. Lu wrote: > On Sun, Jun 12, 2011 at 7:33 AM, H.J. Lu wrote: >> On Sun, Jun 12, 2011 at 7:00 AM, H.J. Lu wrote: >>> On Sun, Jun 12, 2011 at 6:50 AM, Richard Guenther >>> wrote: >>>> On Sun, Jun 12, 2011 at 3:18 PM, H.J. Lu wrote: >>>>> On Sun, Jun 12, 2011 at 3:48 AM, Richard Guenther >>>>> wrote: >>>>>> On Sat, Jun 11, 2011 at 5:09 PM, H.J. Lu wrot= e: >>>>>>> Hi, >>>>>>> >>>>>>> expand_builtin_strlen has >>>>>>> >>>>>>> src_reg =3D gen_reg_rtx (Pmode); >>>>>>> ... >>>>>>> pat =3D expand_expr (src, src_reg, ptr_mode, EXPAND_NORMAL); >>>>>>> if (pat !=3D src_reg) >>>>>>> =A0emit_move_insn (src_reg, pat); >>>>>>> >>>>>>> But src_reg may be in ptr_mode, wich may not be the same as Pmode. >>>>>>> This patch checks it. =A0OK for trunk? >>>>>>> >>>>>>> Thanks. >>>>>>> >>>>>>> >>>>>>> H.J. >>>>>>> --- >>>>>>> 2011-06-11 =A0H.J. Lu =A0 >>>>>>> >>>>>>> =A0 =A0 =A0 =A0PR middle-end/47364 >>>>>>> =A0 =A0 =A0 =A0* builtins.c (expand_builtin_strlen): Properly handl= e target >>>>>>> =A0 =A0 =A0 =A0not in Pmode. >>>>>>> >>>>>>> diff --git a/gcc/builtins.c b/gcc/builtins.c >>>>>>> index 7b24a0c..4e2cf31 100644 >>>>>>> --- a/gcc/builtins.c >>>>>>> +++ b/gcc/builtins.c >>>>>>> @@ -2941,7 +2941,11 @@ expand_builtin_strlen (tree exp, rtx target, >>>>>>> =A0 =A0 =A0 start_sequence (); >>>>>>> =A0 =A0 =A0 pat =3D expand_expr (src, src_reg, ptr_mode, EXPAND_NOR= MAL); >>>>>>> =A0 =A0 =A0 if (pat !=3D src_reg) >>>>>>> - =A0 =A0 =A0 emit_move_insn (src_reg, pat); >>>>>>> + =A0 =A0 =A0 { >>>>>>> + =A0 =A0 =A0 =A0 if (GET_MODE (pat) !=3D Pmode) >>>>>>> + =A0 =A0 =A0 =A0 =A0 pat =3D convert_to_mode (Pmode, pat, 1); >>>>>> >>>>>> Shouldn't this be POINTERS_EXTEND_UNSIGNED instead of 1? >>>>>> >>>>>>> + =A0 =A0 =A0 =A0 emit_move_insn (src_reg, pat); >>>>>> >>>>>> Why not use convert_move unconditionally? >>>>>> >>>>>> Or, why not expand src in Pmode from the start? =A0After all, src_re= g is >>>>>> created as Pmode reg. >>>>>> >>>>> >>>>> This patch works for my testcase. =A0OK for trunk? >>>> >>>> Ok if it passes bootstrap & regtest on a ptr_mode !=3D Pmode target. >>>> >>> >>> Only the following targets expand strlen: >>> >>> avr/avr.md:(define_expand "strlenhi" >>> avr/avr.md:(define_insn "*strlenhi" >>> i386/i386.md:(define_expand "strlen" >>> i386/i386.md: if (ix86_expand_strlen (operands[0], operands[1], >>> operands[2], operands[3])) >>> i386/i386.md:(define_expand "strlenqi_1" >>> i386/i386.md:(define_insn "*strlenqi_1" >>> rs6000/rs6000.md:(define_expand "strlensi" >>> s390/s390.md:; strlenM instruction pattern(s). >>> s390/s390.md:(define_expand "strlen" >>> s390/s390.md:(define_insn "*strlen" >>> >>> None of them, except for my x32 port, are ptr_mode !=3D Pmode targets. >>> I will bootstrap and test it on my x32 branch. >>> >> >> It doesn't work on x32. I got >> >> /export/gnu/import/git/gcc-x32/libssp/gets-chk.c:74:14: internal >> compiler error: in emit_move_insn, at expr.c:3319 >> Please submit a full bug report, >> with preprocessed source if appropriate. >> See for instructions. >> >> How about this patch? >> >> Thanks. > > No regressions on x32 branch. =A0OK for trunk? Does it work with also doing the expansion to Pmode in the first place? If so, ok with that change. Thanks, Richard. > Thanks. > >> -- >> H.J. >> --- >> 2011-06-12 =A0H.J. Lu =A0 >> >> =A0 =A0 =A0 =A0PR middle-end/47364 >> =A0 =A0 =A0 =A0* builtins.c (expand_builtin_strlen): Properly handle tar= get >> =A0 =A0 =A0 =A0not in Pmode. >> >> diff --git a/gcc/builtins.c b/gcc/builtins.c >> index 7b24a0c..a2f175d 100644 >> --- a/gcc/builtins.c >> +++ b/gcc/builtins.c >> @@ -2941,7 +2941,14 @@ expand_builtin_strlen (tree exp, rtx target, >> =A0 =A0 =A0 start_sequence (); >> =A0 =A0 =A0 pat =3D expand_expr (src, src_reg, ptr_mode, EXPAND_NORMAL); >> =A0 =A0 =A0 if (pat !=3D src_reg) >> - =A0 =A0 =A0 emit_move_insn (src_reg, pat); >> + =A0 =A0 =A0 { >> +#ifdef POINTERS_EXTEND_UNSIGNED >> + =A0 =A0 =A0 =A0 if (GET_MODE (pat) !=3D Pmode) >> + =A0 =A0 =A0 =A0 =A0 pat =3D convert_to_mode (Pmode, pat, >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0POI= NTERS_EXTEND_UNSIGNED); >> +#endif >> + =A0 =A0 =A0 =A0 emit_move_insn (src_reg, pat); >> + =A0 =A0 =A0 } >> =A0 =A0 =A0 pat =3D get_insns (); >> =A0 =A0 =A0 end_sequence (); >> > > > > -- > H.J. >