From: H.J. Lu <hongjiu.lu@intel.com>
Date: Tue, 14 Jun 2011 16:31:57 +0000 (+0000)
Subject: Properly expand strlen to Pmode.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fa4657624c6609bbfffb4ec5fb1e19e44691c864;p=gcc.git

Properly expand strlen to Pmode.

2011-06-14  H.J. Lu  <hongjiu.lu@intel.com>

	PR middle-end/47364
	* builtins.c (expand_builtin_strlen): Expand strlen to Pmode
	and properly handle result not in Pmode.

From-SVN: r175034
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 651f380e54f..56e88cfaabb 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2011-06-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR middle-end/47364
+	* builtins.c (expand_builtin_strlen): Expand strlen to Pmode
+	and properly handle result not in Pmode.
+
 2011-06-14  Robert Millan  <rmh@gnu.org>
 
 	* config/i386/kfreebsd-gnu.h: Resync with `config/i386/linux.h'.
diff --git a/gcc/builtins.c b/gcc/builtins.c
index 7b24a0ce703..cf975e578a7 100644
--- a/gcc/builtins.c
+++ b/gcc/builtins.c
@@ -2939,9 +2939,16 @@ expand_builtin_strlen (tree exp, rtx target,
 
       /* Now that we are assured of success, expand the source.  */
       start_sequence ();
-      pat = expand_expr (src, src_reg, ptr_mode, EXPAND_NORMAL);
+      pat = expand_expr (src, src_reg, Pmode, 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 ();