[llvm-commits] [llvm-gcc-4.2] r41839 - /llvm-gcc-4.2/trunk/gcc/c-typeck.c

[Duncan Sands]

Author: baldrick
Date: Tue Sep 11 07:09:22 2007
New Revision: 41839

URL: http://llvm.org/viewvc/llvm-project?rev=41839&view=rev
Log:
Revert r41761 because it is not needed for 4.2.

Modified:
    llvm-gcc-4.2/trunk/gcc/c-typeck.c

Modified: llvm-gcc-4.2/trunk/gcc/c-typeck.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/c-typeck.c?rev=41839&r1=41838&r2=41839&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/c-typeck.c (original)
+++ llvm-gcc-4.2/trunk/gcc/c-typeck.c Tue Sep 11 07:09:22 2007
@@ -6453,13 +6453,7 @@
 
   if (value == error_mark_node)
     constructor_erroneous = 1;
-  else if (!(TREE_CONSTANT (value)
-             || (DECL_P (value)
-                 && DECL_INITIAL (value)
-                 && DECL_INITIAL (value) != error_mark_node
-                 && ! TREE_THIS_VOLATILE (value)
-                 && ! TYPE_P (DECL_INITIAL (value))
-                 && TREE_CONSTANT (DECL_INITIAL (value)))))
+  else if (!TREE_CONSTANT (value))
     constructor_constant = 0;
   else if (!initializer_constant_valid_p (value, TREE_TYPE (value))
 	   || ((TREE_CODE (constructor_type) == RECORD_TYPE