From patchwork Sun Jun 12 14:33:37 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 100097 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id D3D37B70A1 for ; Mon, 13 Jun 2011 00:33:56 +1000 (EST) Received: (qmail 31574 invoked by alias); 12 Jun 2011 14:33:55 -0000 Received: (qmail 31566 invoked by uid 22791); 12 Jun 2011 14:33:54 -0000 X-SWARE-Spam-Status: No, hits=-2.3 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-qy0-f182.google.com (HELO mail-qy0-f182.google.com) (209.85.216.182) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sun, 12 Jun 2011 14:33:38 +0000 Received: by qyk27 with SMTP id 27so2272500qyk.20 for ; Sun, 12 Jun 2011 07:33:37 -0700 (PDT) MIME-Version: 1.0 Received: by 10.229.99.80 with SMTP id t16mr3095198qcn.73.1307889217391; Sun, 12 Jun 2011 07:33:37 -0700 (PDT) Received: by 10.229.47.78 with HTTP; Sun, 12 Jun 2011 07:33:37 -0700 (PDT) In-Reply-To: References: <20110611150953.GA18253@intel.com> Date: Sun, 12 Jun 2011 07:33:37 -0700 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: "H.J. Lu" To: Richard Guenther Cc: gcc-patches@gcc.gnu.org X-IsSubscribed: yes 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 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 wrote: >>>>> Hi, >>>>> >>>>> expand_builtin_strlen has >>>>> >>>>> src_reg = gen_reg_rtx (Pmode); >>>>> ... >>>>> pat = expand_expr (src, src_reg, ptr_mode, EXPAND_NORMAL); >>>>> if (pat != src_reg) >>>>>  emit_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.  OK for trunk? >>>>> >>>>> Thanks. >>>>> >>>>> >>>>> H.J. >>>>> --- >>>>> 2011-06-11  H.J. Lu   >>>>> >>>>>        PR middle-end/47364 >>>>>        * builtins.c (expand_builtin_strlen): Properly handle target >>>>>        not 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, >>>>>       start_sequence (); >>>>>       pat = expand_expr (src, src_reg, ptr_mode, EXPAND_NORMAL); >>>>>       if (pat != src_reg) >>>>> -       emit_move_insn (src_reg, pat); >>>>> +       { >>>>> +         if (GET_MODE (pat) != Pmode) >>>>> +           pat = convert_to_mode (Pmode, pat, 1); >>>> >>>> Shouldn't this be POINTERS_EXTEND_UNSIGNED instead of 1? >>>> >>>>> +         emit_move_insn (src_reg, pat); >>>> >>>> Why not use convert_move unconditionally? >>>> >>>> Or, why not expand src in Pmode from the start?  After all, src_reg is >>>> created as Pmode reg. >>>> >>> >>> This patch works for my testcase.  OK for trunk? >> >> Ok if it passes bootstrap & regtest on a ptr_mode != 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 != 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. 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, start_sequence (); pat = expand_expr (src, src_reg, ptr_mode, EXPAND_NORMAL); if (pat != src_reg) - emit_move_insn (src_reg, pat); + { +#ifdef POINTERS_EXTEND_UNSIGNED + if (GET_MODE (pat) != Pmode) + pat = convert_to_mode (Pmode, pat, + POINTERS_EXTEND_UNSIGNED); +#endif + emit_move_insn (src_reg, pat); + } pat = get_insns (); end_sequence ();