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

[Stuart Hastings]

Author: stuart
Date: Wed Sep  8 13:09:44 2010
New Revision: 113376

URL: http://llvm.org/viewvc/llvm-project?rev=113376&view=rev
Log:
Merge 113248 into Morbo branch.  Radar 8361341.

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

Propchange: llvm-gcc-4.2/branches/Apple/Morbo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep  8 13:09:44 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,107439,107843,108784-108786,109556-109557,109702,110043,110250,110405,110459,110501,110689,110727
+/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,107439,107843,108784-108786,109556-109557,109702,110043,110250,110405,110459,110501,110689,110727,113248

Modified: llvm-gcc-4.2/branches/Apple/Morbo/gcc/c-typeck.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/gcc/c-typeck.c?rev=113376&r1=113375&r2=113376&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/gcc/c-typeck.c (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/gcc/c-typeck.c Wed Sep  8 13:09:44 2010
@@ -2124,7 +2124,10 @@
        * and it provides it with more information for optimization.
        */
       {
-        tree ty = TREE_TYPE(TREE_TYPE(ar));
+        /* LLVM LOCAL begin 8361341 */
+        tree orig_ty = TREE_TYPE(TREE_TYPE(ar));
+        tree ty = orig_ty;
+        /* LLVM LOCAL end 8361341 */
         if (TREE_CODE(ty) == RECORD_TYPE || TREE_CODE(ty) == UNION_TYPE
             || TREE_CODE(ty) == QUAL_UNION_TYPE)
           ty = TYPE_MAIN_VARIANT (ty);
@@ -2141,8 +2144,10 @@
         /* Mirror logic from build_indirect_ref to set TREE_THIS_VOLATILE and
          * other flags.
          */
-        TREE_READONLY (ar) = TYPE_READONLY (TREE_TYPE (ar));
-        TREE_THIS_VOLATILE(ar) = TYPE_VOLATILE(TREE_TYPE (ar));
+        /* LLVM LOCAL begin 8361341 */
+        TREE_READONLY (ar) = TYPE_READONLY (orig_ty);
+        TREE_THIS_VOLATILE(ar) = TYPE_VOLATILE(orig_ty);
+        /* LLVM LOCAL end 8361341 */
         TREE_SIDE_EFFECTS (ar)
           = TREE_THIS_VOLATILE (ar) || TREE_SIDE_EFFECTS (array) ||
             TREE_SIDE_EFFECTS (index);