[llvm-commits] [llvm-gcc-4.2] r40126 - /llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp

[Duncan Sands]

Author: baldrick
Date: Fri Jul 20 17:27:50 2007
New Revision: 40126

URL: http://llvm.org/viewvc/llvm-project?rev=40126&view=rev
Log:
Fix 2006-03-03-MissingInitializer.c.

Modified:
    llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp

Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp?rev=40126&r1=40125&r2=40126&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Fri Jul 20 17:27:50 2007
@@ -5044,9 +5044,9 @@
   }
   
   if (GlobalValue *GV = dyn_cast<GlobalValue>(Decl)) {
-    // If this is an aggregate CONST_DECL, emit it to LLVM now.  GCC happens to
+    // If this is an aggregate, emit it to LLVM now.  GCC happens to
     // get this case right by forcing the initializer into memory.
-    if (TREE_CODE(exp) == CONST_DECL) {
+    if (TREE_CODE(exp) == CONST_DECL || TREE_CODE(exp) == VAR_DECL) {
       if (DECL_INITIAL(exp) && GV->isDeclaration()) {
         emit_global_to_llvm(exp);
         Decl = DECL_LLVM(exp);     // Decl could have change if it changed type.
@@ -6137,9 +6137,9 @@
     Val = cast<GlobalValue>(DECL_LLVM(exp));
   }
   
-  // If this is an aggregate CONST_DECL, emit it to LLVM now.  GCC happens to
+  // If this is an aggregate, emit it to LLVM now.  GCC happens to
   // get this case right by forcing the initializer into memory.
-  if (TREE_CODE(exp) == CONST_DECL) {
+  if (TREE_CODE(exp) == CONST_DECL || TREE_CODE(exp) == VAR_DECL) {
     if (DECL_INITIAL(exp) && Val->isDeclaration()) {
       emit_global_to_llvm(exp);
       // Decl could have change if it changed type.