[llvm] r209075 - Handle ConstantAggregateZero when upgrading global_ctors.

[Rafael Espindola]

Author: rafael
Date: Sat May 17 16:00:22 2014
New Revision: 209075

URL: http://llvm.org/viewvc/llvm-project?rev=209075&view=rev
Log:
Handle ConstantAggregateZero when upgrading global_ctors.

Added:
    llvm/trunk/test/Bitcode/upgrade-global-ctors.ll
    llvm/trunk/test/Bitcode/upgrade-global-ctors.ll.bc
Modified:
    llvm/trunk/lib/IR/AutoUpgrade.cpp

Modified: llvm/trunk/lib/IR/AutoUpgrade.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/AutoUpgrade.cpp?rev=209075&r1=209074&r2=209075&view=diff
==============================================================================
--- llvm/trunk/lib/IR/AutoUpgrade.cpp (original)
+++ llvm/trunk/lib/IR/AutoUpgrade.cpp Sat May 17 16:00:22 2014
@@ -191,16 +191,19 @@ static bool UpgradeGlobalStructors(Globa
       StructType::get(GV->getContext(), Tys, /*isPacked=*/false);
 
   // Build new constants with a null third field filled in.
-  ConstantArray *OldInit = dyn_cast<ConstantArray>(GV->getInitializer());
-  if (!OldInit)
+  Constant *OldInitC = GV->getInitializer();
+  ConstantArray *OldInit = dyn_cast<ConstantArray>(OldInitC);
+  if (!OldInit && !isa<ConstantAggregateZero>(OldInitC))
     return false;
   std::vector<Constant *> Initializers;
-  for (Use &U : OldInit->operands()) {
-    ConstantStruct *Init = cast<ConstantStruct>(&U);
-    Constant *NewInit =
+  if (OldInit) {
+    for (Use &U : OldInit->operands()) {
+      ConstantStruct *Init = cast<ConstantStruct>(&U);
+      Constant *NewInit =
         ConstantStruct::get(NewTy, Init->getOperand(0), Init->getOperand(1),
                             Constant::getNullValue(VoidPtrTy), nullptr);
-    Initializers.push_back(NewInit);
+      Initializers.push_back(NewInit);
+    }
   }
   assert(Initializers.size() == ATy->getNumElements());
 

Added: llvm/trunk/test/Bitcode/upgrade-global-ctors.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Bitcode/upgrade-global-ctors.ll?rev=209075&view=auto
==============================================================================
--- llvm/trunk/test/Bitcode/upgrade-global-ctors.ll (added)
+++ llvm/trunk/test/Bitcode/upgrade-global-ctors.ll Sat May 17 16:00:22 2014
@@ -0,0 +1,3 @@
+; RUN:  llvm-dis < %s.bc| FileCheck %s
+
+; CHECK: @llvm.global_ctors = appending global [0 x { i32, void ()*, i8* }] zeroinitializer

Added: llvm/trunk/test/Bitcode/upgrade-global-ctors.ll.bc
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Bitcode/upgrade-global-ctors.ll.bc?rev=209075&view=auto
==============================================================================
Binary files llvm/trunk/test/Bitcode/upgrade-global-ctors.ll.bc (added) and llvm/trunk/test/Bitcode/upgrade-global-ctors.ll.bc Sat May 17 16:00:22 2014 differ