builtins.c (c_strlen): Make only_value == 2 really only affect warning generation.

2014-07-14  Richard Biener  <rguenther@suse.de>

	* builtins.c (c_strlen): Make only_value == 2 really only
	affect warning generation.

From-SVN: r212514

gcc/ChangeLog

 2014-07-14  Richard Biener  <rguenther@suse.de>
 
+	* builtins.c (c_strlen): Make only_value == 2 really only
+	affect warning generation.
+
+2014-07-14  Richard Biener  <rguenther@suse.de>
+
 	PR tree-optimization/61757
 	PR tree-optimization/61783
 	PR tree-optimization/61787

gcc/builtins.c

@@ -610,11 +610,11 @@ c_strlen (tree src, int only_value)
 
   /* If the offset is known to be out of bounds, warn, and call strlen at
      runtime.  */
-  if (only_value != 2
-      && (offset < 0 || offset > max))
+  if (offset < 0 || offset > max)
     {
      /* Suppress multiple warnings for propagated constant strings.  */
-      if (! TREE_NO_WARNING (src))
+      if (only_value != 2
+	  && !TREE_NO_WARNING (src))
         {
           warning_at (loc, 0, "offset outside bounds of constant string");
           TREE_NO_WARNING (src) = 1;