The refactoring had two errors, fixed as below. Boostrapped and tested on x86_64-unknown-linux-gnu, applied.
Richard. 2014-08-29 Richard Biener <rguent...@suse.de> * gimple-fold.c (gimple_fold_builtin_strcpy): Fix error from previous refactoring. (gimple_fold_builtin_strncpy): Likewise. Index: gcc/gimple-fold.c =================================================================== --- gcc/gimple-fold.c (revision 214680) +++ gcc/gimple-fold.c (working copy) @@ -1440,7 +1440,7 @@ gimple_fold_builtin_strcpy (gimple_stmt_ if (!fn) return false; - tree len = get_maxval_strlen (src, 1); + tree len = get_maxval_strlen (src, 0); if (!len) return false; @@ -1477,7 +1477,7 @@ gimple_fold_builtin_strncpy (gimple_stmt return false; /* Now, we must be passed a constant src ptr parameter. */ - tree slen = get_maxval_strlen (src, 1); + tree slen = get_maxval_strlen (src, 0); if (!slen || TREE_CODE (slen) != INTEGER_CST) return false;