From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 11 Sep 2013 11:35:51 +0000 (+0000)
Subject: 	PR tree-optimization/58385
X-Git-Tag: upstream/4.9.2~4314
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6b960911712a94dbe6693bf43839d987f73e0192;p=platform%2Fupstream%2Flinaro-gcc.git

	PR tree-optimization/58385
	* fold-const.c (build_range_check): If both low and high are NULL,
	use omit_one_operand_loc to preserve exp side-effects.

	* gcc.c-torture/execute/pr58385.c: New test.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@202494 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8b2e2bb..e5e1702 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2013-09-11  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/58385
+	* fold-const.c (build_range_check): If both low and high are NULL,
+	use omit_one_operand_loc to preserve exp side-effects.
+
 2013-09-11  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
 
 	* config/arm/arm.md (arm_shiftsi3): New alternative l/l/M.
diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index 9956b2c..8d57928 100644
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -4299,7 +4299,7 @@ build_range_check (location_t loc, tree type, tree exp, int in_p,
     }
 
   if (low == 0 && high == 0)
-    return build_int_cst (type, 1);
+    return omit_one_operand_loc (loc, type, build_int_cst (type, 1), exp);
 
   if (low == 0)
     return fold_build2_loc (loc, LE_EXPR, type, exp,
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 718e542..c924967 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-11  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/58385
+	* gcc.c-torture/execute/pr58385.c: New test.
+
 2013-09-11  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
 
 	* gcc.target/arm/thumb-ifcvt-2.c: New test.
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr58385.c b/gcc/testsuite/gcc.c-torture/execute/pr58385.c
new file mode 100644
index 0000000..8d7da6f
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/pr58385.c
@@ -0,0 +1,21 @@
+/* PR tree-optimization/58385 */
+
+extern void abort (void);
+
+int a, b = 1;
+
+int
+foo ()
+{
+  b = 0;
+  return 0;
+}
+
+int
+main ()
+{
+  ((0 || a) & foo () >= 0) <= 1 && 1;
+  if (b)
+    abort ();
+  return 0;
+}