From 77bbb54fbfbc4aa03af427ce856c419a64e72b86 Mon Sep 17 00:00:00 2001
From: Rafael Espindola <rafael.espindola@gmail.com>
Date: Sat, 17 May 2014 21:00:22 +0000
Subject: [PATCH] Handle ConstantAggregateZero when upgrading global_ctors.

llvm-svn: 209075
---
 llvm/lib/IR/AutoUpgrade.cpp                  |  15 +++++++++------
 llvm/test/Bitcode/upgrade-global-ctors.ll    |   3 +++
 llvm/test/Bitcode/upgrade-global-ctors.ll.bc | Bin 0 -> 316 bytes
 3 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 llvm/test/Bitcode/upgrade-global-ctors.ll
 create mode 100644 llvm/test/Bitcode/upgrade-global-ctors.ll.bc

diff --git a/llvm/lib/IR/AutoUpgrade.cpp b/llvm/lib/IR/AutoUpgrade.cpp
index d0fb71f341b7..e255113aab7e 100644
--- a/llvm/lib/IR/AutoUpgrade.cpp
+++ b/llvm/lib/IR/AutoUpgrade.cpp
@@ -191,16 +191,19 @@ static bool UpgradeGlobalStructors(GlobalVariable *GV) {
       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());
 
diff --git a/llvm/test/Bitcode/upgrade-global-ctors.ll b/llvm/test/Bitcode/upgrade-global-ctors.ll
new file mode 100644
index 000000000000..bd253a81620f
--- /dev/null
+++ b/llvm/test/Bitcode/upgrade-global-ctors.ll
@@ -0,0 +1,3 @@
+; RUN:  llvm-dis < %s.bc| FileCheck %s
+
+; CHECK: @llvm.global_ctors = appending global [0 x { i32, void ()*, i8* }] zeroinitializer
diff --git a/llvm/test/Bitcode/upgrade-global-ctors.ll.bc b/llvm/test/Bitcode/upgrade-global-ctors.ll.bc
new file mode 100644
index 0000000000000000000000000000000000000000..927fd91867e916a35fecbfa76fceb24166039599
GIT binary patch
literal 316
zcmZ>AK5$Qwhk?O|fq{X$Nr8b0NDBcmd!zD1#}h1`Yyw7>lNeigR9QJB<yg9t8hBip
zoF;KQr3e^_Sa3*qav8a(cyLWnR6Y{az$2+xq{4pUgh0}Y1uGnmeP9Hd)2RS77f2f^
zo#0SNX=RzLxTFP0JZ@PyK}5)>t%tiM#YaG<m?go0DWGXWPlGDMN(L+b6b}Vu6$ge{
z3XwqV46Gpiax*w21$`#;aH_c<V{v}P0Tip0U|<jj(#9MOGDjZDq=_)vb~szK9PV*y
zV6UuTFP>4z^NfN2tpMMb20mjRC%HohWzQ{?Ni$#tD{GcM!)$xP*|vw-_Dn@jNdbE`
y2YaPQdqDwvRRMEZMSFn)JJ9Sx1qKEdAk8MA>wWacu}3TiK5<VL_5_MBFaQAd5mcT4

literal 0
HcmV?d00001