From: Qing Zhao <qing.zhao@oracle.com>
Date: Wed, 15 Aug 2018 16:33:52 +0000 (+0000)
Subject: Do not expand the call to memcmp at all when overflow is detected.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b99d7d976ba2475f038ea1406a1fb9a8fb6c4f5a;p=gcc.git

Do not expand the call to memcmp at all when overflow is detected.

From-SVN: r263563
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8ca8b562a0e..e575b553c42 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2018-08-15  Qing Zhao  <qing.zhao@oracle.com>
+
+	PR testsuite/86519
+	* builtins.c (expand_builtin_memcmp): Do not expand the call
+	when overflow is detected.
+
 2018-08-15  Martin Sebor  <msebor@redhat.com>
 
 	PR tree-optimization/71625
diff --git a/gcc/builtins.c b/gcc/builtins.c
index 867d153d798..6716aabfa73 100644
--- a/gcc/builtins.c
+++ b/gcc/builtins.c
@@ -4481,11 +4481,16 @@ expand_builtin_memcmp (tree exp, rtx target, bool result_eq)
 				  /*objsize=*/NULL_TREE);
     }
 
+  /* If the specified length exceeds the size of either object, 
+     call the function.  */
+  if (!no_overflow)
+    return NULL_RTX;
+
   /* Due to the performance benefit, always inline the calls first
      when result_eq is false.  */
   rtx result = NULL_RTX;
 
-  if (!result_eq && fcode != BUILT_IN_BCMP && no_overflow)
+  if (!result_eq && fcode != BUILT_IN_BCMP)
     {
       result = inline_expand_builtin_string_cmp (exp, target);
       if (result)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0bcf92fe7d2..bd167b3a77e 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2018-08-15  Qing Zhao <qing.zhao@oracle.com>
+
+	PR testsuite/86519
+	* gcc.dg/strcmpopt_6.c: Scan the assembly file instead of
+	the .expand file.
+
 2018-08-15  Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>
 
 	* gcc.dg/wmain.c: New test.
diff --git a/gcc/testsuite/gcc.dg/strcmpopt_6.c b/gcc/testsuite/gcc.dg/strcmpopt_6.c
index 964b9e4839f..4c6de02824f 100644
--- a/gcc/testsuite/gcc.dg/strcmpopt_6.c
+++ b/gcc/testsuite/gcc.dg/strcmpopt_6.c
@@ -1,7 +1,7 @@
 /* When the specified length exceeds one of the arguments of the call to memcmp, 
    the call to memcmp should NOT be inlined.  */
-/* { dg-do run } */
-/* { dg-options "-O2 -fdump-rtl-expand -Wno-stringop-overflow" } */
+/* { dg-do compile } */
+/* { dg-options "-O2 -Wno-stringop-overflow" } */
 
 typedef struct { char s[8]; int x; } S;
 
@@ -33,4 +33,4 @@ int main (void)
 
 }
 
-/* { dg-final { scan-rtl-dump-times "__builtin_memcmp" 6 "expand" } } */
+/* { dg-final { scan-assembler-times "memcmp" 2 } } */