[llvm-commits] [llvm-gcc-4.2] r63824 - /llvm-gcc-4.2/branches/Apple/Dib/gcc/cp/parser.c

[Bill Wendling]

Author: void
Date: Wed Feb  4 22:22:09 2009
New Revision: 63824

URL: http://llvm.org/viewvc/llvm-project?rev=63824&view=rev
Log:
Pull r63696 into Dib:

<rdar://problem/6530069>

Call cp_finish_decl() before marking the block_holder_tmp_decl
readonly.  Fixes these DejaGNU regressions:

g++.apple/block-call-with-sideeffect.c
g++.apple/block-global-block.c
g++.apple/block-id-global-block.c
g++.apple/block-localisglobal.c
g++.apple/block-nested-global-copied-var-2.c
g++.apple/block-nested-global.c


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

Modified: llvm-gcc-4.2/branches/Apple/Dib/gcc/cp/parser.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Dib/gcc/cp/parser.c?rev=63824&r1=63823&r2=63824&view=diff

==============================================================================
--- llvm-gcc-4.2/branches/Apple/Dib/gcc/cp/parser.c (original)
+++ llvm-gcc-4.2/branches/Apple/Dib/gcc/cp/parser.c Wed Feb  4 22:22:09 2009
@@ -21065,13 +21065,13 @@
     TREE_PUBLIC (block_holder_tmp_decl) = 0;
     TREE_STATIC (block_holder_tmp_decl) = 1;
   }
+  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 */
-  cp_finish_decl (block_holder_tmp_decl, constructor, 0, 0, LOOKUP_ONLYCONVERTING);
   return block_holder_tmp_decl;
 }
 /* APPLE LOCAL end radar 6169527 */