[llvm-branch-commits] [llvm-gcc-branch] r75709 - /llvm-gcc-4.2/branches/Apple/Bender-SWB/gcc/cp/parser.c

[Bill Wendling]

Author: void
Date: Tue Jul 14 18:18:05 2009
New Revision: 75709

URL: http://llvm.org/viewvc/llvm-project?rev=75709&view=rev
Log:
--- Merging r74609 into '.':
U    gcc/cp/parser.c


Modified:
    llvm-gcc-4.2/branches/Apple/Bender-SWB/gcc/cp/parser.c

Modified: llvm-gcc-4.2/branches/Apple/Bender-SWB/gcc/cp/parser.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Bender-SWB/gcc/cp/parser.c?rev=75709&r1=75708&r2=75709&view=diff

==============================================================================
--- llvm-gcc-4.2/branches/Apple/Bender-SWB/gcc/cp/parser.c (original)
+++ llvm-gcc-4.2/branches/Apple/Bender-SWB/gcc/cp/parser.c Tue Jul 14 18:18:05 2009
@@ -21060,18 +21060,13 @@
   CONSTRUCTOR_ELTS (constructor) = build_block_struct_initlist (block_struct_type,
                                                                 block_impl);
   /* Temporary representing a global block is made global static.  */
-  /* APPLE LOCAL radar 6230297 */
+  /* APPLE LOCAL begin radar 6230297 */
   if (staticBlockTmp || global_bindings_p ()) {
     TREE_PUBLIC (block_holder_tmp_decl) = 0;
     TREE_STATIC (block_holder_tmp_decl) = 1;
   }
+  /* APPLE LOCAL end radar 6230297 */
   cp_finish_decl (block_holder_tmp_decl, constructor, 0, 0, LOOKUP_ONLYCONVERTING);
-  /* LLVM LOCAL begin radar 5865221 */
-#ifdef ENABLE_LLVM
-  TREE_CONSTANT (block_holder_tmp_decl) = 1;
-  TREE_READONLY (block_holder_tmp_decl) = 1;
-#endif
-  /* LLVM LOCAL end radar 5865221 */
   return block_holder_tmp_decl;
 }
 /* APPLE LOCAL end radar 6169527 */