tree-ssa-strlen.c: include ipa-chkp.h, cgraph.h, ipa-ref.h, plugin-api.h.

gcc/

	* tree-ssa-strlen.c: include ipa-chkp.h, cgraph.h,
	ipa-ref.h, plugin-api.h.
	(get_string_length): Handle calls with bounds.
	(adjust_last_stmt): Likewise.
	(handle_builtin_strchr): Likewise.
	(handle_builtin_strcpy): Likewise.
	(handle_builtin_memcpy): Likewise.
	(handle_builtin_strcat): Likewise.

gcc/testsuite/

	* gcc.target/i386/chkp-strlen-1.c: New.
	* gcc.target/i386/chkp-strlen-2.c: New.
	* gcc.target/i386/chkp-strlen-3.c: New.
	* gcc.target/i386/chkp-strlen-4.c: New.
	* gcc.target/i386/chkp-strlen-5.c: New.

From-SVN: r217657

gcc/ChangeLog

 2014-11-17  Ilya Enkovich  <ilya.enkovich@intel.com>
 
+	* tree-ssa-strlen.c: include ipa-chkp.h, cgraph.h,
+	ipa-ref.h, plugin-api.h.
+	(get_string_length): Handle calls with bounds.
+	(adjust_last_stmt): Likewise.
+	(handle_builtin_strchr): Likewise.
+	(handle_builtin_strcpy): Likewise.
+	(handle_builtin_memcpy): Likewise.
+	(handle_builtin_strcat): Likewise.
+
+2014-11-17  Ilya Enkovich  <ilya.enkovich@intel.com>
+
 	* tree-chkp-opt.c (chkp_get_nobnd_fndecl): New.
 	(chkp_get_nochk_fndecl): New.
 	(chkp_optimize_string_function_calls): New.

gcc/testsuite/ChangeLog

 2014-11-17  Ilya Enkovich  <ilya.enkovich@intel.com>
 
+	* gcc.target/i386/chkp-strlen-1.c: New.
+	* gcc.target/i386/chkp-strlen-2.c: New.
+	* gcc.target/i386/chkp-strlen-3.c: New.
+	* gcc.target/i386/chkp-strlen-4.c: New.
+	* gcc.target/i386/chkp-strlen-5.c: New.
+
+2014-11-17  Ilya Enkovich  <ilya.enkovich@intel.com>
+
 	* gcc.target/i386/chkp-stropt-1.c: New.
 	* gcc.target/i386/chkp-stropt-2.c: New.
 	* gcc.target/i386/chkp-stropt-3.c: New.

gcc/testsuite/gcc.target/i386/chkp-strlen-1.c

+/* { dg-do compile } */
+/* { dg-require-effective-target mpx } */
+/* { dg-options "-fcheck-pointer-bounds -mmpx -O2 -fdump-tree-strlen" } */
+/* { dg-final { scan-tree-dump "memcpy.chkp" "strlen" } } */
+/* { dg-final { cleanup-tree-dump "strlen" } } */
+
+#include "string.h"
+
+char *test (char *str1, char *str2)
+{
+  size_t len = strlen (str2);
+  strcpy (str1, str2);
+  return str1 + len;
+}

gcc/testsuite/gcc.target/i386/chkp-strlen-2.c

+/* { dg-do compile } */
+/* { dg-require-effective-target mpx } */
+/* { dg-options "-fcheck-pointer-bounds -mmpx -O2 -fdump-tree-strlen" } */
+/* { dg-final { scan-tree-dump-not "strlen" "strlen" } } */
+/* { dg-final { cleanup-tree-dump "strlen" } } */
+
+#include "string.h"
+
+char *test (char *str1, char *str2)
+{
+  char *p = stpcpy (str1, str2);
+  size_t len = strlen (str1);
+  return p + len;
+}

gcc/testsuite/gcc.target/i386/chkp-strlen-3.c

+/* { dg-do compile } */
+/* { dg-require-effective-target mpx } */
+/* { dg-options "-fcheck-pointer-bounds -mmpx -O2 -fdump-tree-strlen" } */
+/* { dg-final { scan-tree-dump-times "strlen" 1 "strlen" } } */
+/* { dg-final { cleanup-tree-dump "strlen" } } */
+
+#include "string.h"
+
+size_t test (char *str1, char *str2)
+{
+  size_t len = strlen (str2);
+  memcpy (str1, str2, len + 1);
+  return len + strlen (str1);
+}

gcc/testsuite/gcc.target/i386/chkp-strlen-4.c

+/* { dg-do compile } */
+/* { dg-require-effective-target mpx } */
+/* { dg-options "-fcheck-pointer-bounds -mmpx -O2 -fdump-tree-strlen -D_GNU_SOURCE" } */
+/* { dg-final { scan-tree-dump-times "strlen" 1 "strlen" } } */
+/* { dg-final { cleanup-tree-dump "strlen" } } */
+
+#include "string.h"
+
+char * test (char *str1, char *str2)
+{
+  size_t len = strlen (str2);
+  char *p = (char *)mempcpy (str1, str2, len + 1);
+  return p + len + strlen (str1);
+}

gcc/testsuite/gcc.target/i386/chkp-strlen-5.c

+/* { dg-do compile } */
+/* { dg-require-effective-target mpx } */
+/* { dg-options "-fcheck-pointer-bounds -mmpx -O2 -fdump-tree-strlen" } */
+/* { dg-final { scan-tree-dump-times "strlen" 2 "strlen" } } */
+/* { dg-final { scan-tree-dump "memcpy" "strlen" } } */
+/* { dg-final { cleanup-tree-dump "strlen" } } */
+
+#include "string.h"
+
+size_t test (char *str1, char *str2)
+{
+  size_t len1 = strlen (str1);
+  size_t len2 = strlen (str2);
+  strcat (str1, str2);
+  return len1 + len2 + strlen (str1);
+}