[llvm-branch-commits] [llvm-gcc-branch] r109558 - in /llvm-gcc-4.2/branches/Apple/Morbo: ./ gcc/fold-const.c

[Stuart Hastings]

Author: stuart
Date: Tue Jul 27 18:24:23 2010
New Revision: 109558

URL: http://llvm.org/viewvc/llvm-project?rev=109558&view=rev
Log:
Defeat const-multiply folding across a MIN().  Morbonize r109556.  Radar 8198362.

Modified:
    llvm-gcc-4.2/branches/Apple/Morbo/   (props changed)
    llvm-gcc-4.2/branches/Apple/Morbo/gcc/fold-const.c

Propchange: llvm-gcc-4.2/branches/Apple/Morbo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 27 18:24:23 2010
@@ -1,2 +1,2 @@
 /llvm/trunk:100565
-/llvm-gcc-4.2/trunk:98728,98841,98893,99196,99305,99592-99593,99629,99670,99982,99984-99986,99988,99992-99993,99995,99997-99999,100035,100149,100303,100565,100624-100626,100712,100721,101090-101091,101199,101216,101304,101333,101804,101959,102139,102148,102433,102444,102506-102507,102511,102532,102561,102589,102636,102648,102745,103361,103366-103367,103394,103414,103644,103800,103918,104181,104384,104420,104423,104523,104726,105504,105828-105829,105902,105948-105949,106005,106243-106244,106270,106352,106564,106611-106612,106681,106690,106711,107062,107843,108784-108786
+/llvm-gcc-4.2/trunk:98728,98841,98893,99196,99305,99592-99593,99629,99670,99982,99984-99986,99988,99992-99993,99995,99997-99999,100035,100149,100303,100565,100624-100626,100712,100721,101090-101091,101199,101216,101304,101333,101804,101959,102139,102148,102433,102444,102506-102507,102511,102532,102561,102589,102636,102648,102745,103361,103366-103367,103394,103414,103644,103800,103918,104181,104384,104420,104423,104523,104726,105504,105828-105829,105902,105948-105949,106005,106243-106244,106270,106352,106564,106611-106612,106681,106690,106711,107062,107843,108784-108786,109556-109557

Modified: llvm-gcc-4.2/branches/Apple/Morbo/gcc/fold-const.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/gcc/fold-const.c?rev=109558&r1=109557&r2=109558&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/gcc/fold-const.c (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/gcc/fold-const.c Tue Jul 27 18:24:23 2010
@@ -5714,6 +5714,9 @@
       if (TYPE_UNSIGNED (ctype) != TYPE_UNSIGNED (type))
 	break;
 
+      /* LLVM LOCAL 8198362 */
+      if (TYPE_UNSIGNED (ctype)) break;
+
       /* MIN (a, b) / 5 -> MIN (a / 5, b / 5)  */
       sub_strict_overflow_p = false;
       if ((t1 = extract_muldiv (op0, c, code, wide_type,