[llvm-branch-commits] [llvm-gcc-branch] r106104 - in /llvm-gcc-4.2/branches/Apple/Morbo: ./ gcc/gimplify.c

[Stuart Hastings]

Author: stuart
Date: Wed Jun 16 11:06:54 2010
New Revision: 106104

URL: http://llvm.org/viewvc/llvm-project?rev=106104&view=rev
Log:
Morbonify r105948, r105949, r106005.  Radar 8004649.

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

Propchange: llvm-gcc-4.2/branches/Apple/Morbo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 16 11:06:54 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,104726,105504,105828-105829,105902
+/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,104726,105504,105828-105829,105902,105948-105949,106005

Modified: llvm-gcc-4.2/branches/Apple/Morbo/gcc/gimplify.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/gcc/gimplify.c?rev=106104&r1=106103&r2=106104&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/gcc/gimplify.c (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/gcc/gimplify.c Wed Jun 16 11:06:54 2010
@@ -5531,8 +5531,11 @@
 #ifdef ENABLE_LLVM
           /* Handle the LLVM "ARRAY_REF with pointer base" extension by treating
              pointer-based ARRAY_REFs as binary expressions. */
-          if (TREE_CODE (TREE_TYPE (TREE_OPERAND (*expr_p, 0))) != ARRAY_TYPE)
+          if (TREE_CODE (TREE_TYPE (TREE_OPERAND (*expr_p, 0))) != ARRAY_TYPE) {
+            /* LLVM LOCAL 8004649 */
+            gimplify_type_sizes (TREE_TYPE (*expr_p), pre_p);
             goto expr_2;
+          }
 #endif
           /* LLVM LOCAL end */